diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index ac24d66ac..035f6ba17 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -78,9 +78,10 @@ export class AbstractViewPopup extends AbstractView
 	afterShow() {}  // Happens after  showModal() animation transitionend
 	onHide() {}     // Happens before animation transitionend
 	afterHide() {}  // Happens after  animation transitionend
-
-	close() {}
 */
+	close() {
+		this.modalVisible(false);
+	}
 }
 
 AbstractViewPopup.showModal = function(params = []) {
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index 852fe2274..d21eb3468 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -48,8 +48,6 @@ const
 				vm.viewModelDom = ViewModelClass.__dom = vmDom;
 
 				if (dialog) {
-					vm.close = () => hideScreenPopup(ViewModelClass);
-
 					// Firefox < 98 / Safari < 15.4 HTMLDialogElement not defined
 					if (!vmDom.showModal) {
 						vmDom.className = 'polyfill';
@@ -155,14 +153,6 @@ const
 		});
 	},
 
-	/**
-	 * @param {Function} ViewModelClassToHide
-	 * @returns {void}
-	 */
-	hideScreenPopup = ViewModelClassToHide =>
-		ViewModelClassToHide?.__vm && ViewModelClassToHide.__dom
-		&& ViewModelClassToHide.__vm.modalVisible(false),
-
 	/**
 	 * @param {string} screenName
 	 * @param {string} subPart
@@ -276,7 +266,7 @@ export const
 		});
 
 		const cross = new Crossroads();
-		cross.addRoute(/^([^/]+)\/?(.*)$/, screenOnRoute);
+		cross.addRoute(/^([^/]*)\/?(.*)$/, screenOnRoute);
 
 		hasher.add(cross.parse.bind(cross));
 		hasher.init();