diff --git a/web/app/assets/javascripts/jamkazam.js b/web/app/assets/javascripts/jamkazam.js
index 108c7753a..fba55b8f8 100644
--- a/web/app/assets/javascripts/jamkazam.js
+++ b/web/app/assets/javascripts/jamkazam.js
@@ -322,7 +322,9 @@
 
             var hash = context.location.hash;
 
-            if(!this.layout.isScreenName(hash)) {
+            try { context.RouteMap.parse(hash); }
+            catch(e) {
+                console.log("ignoring bogus screen name: %o", hash)
                 hash = null;
             }
 
diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js
index 979a73d5d..53bac88fa 100644
--- a/web/app/assets/javascripts/layout.js
+++ b/web/app/assets/javascripts/layout.js
@@ -428,18 +428,6 @@
             dialogEvent(dialog, 'afterHide');
         }
 
-        function isScreenName(screenName) {
-            if(!screenName) return false;
-
-            var hashIndex = screenName.indexOf('#');
-
-            if(hashIndex > -1) {
-               screenName = screenName.substr(hashIndex);
-            }
-
-            return screenBindings[screenName];
-        }
-
         function screenEvent(screen, evtName, data) {
             if (screen && screen in screenBindings) {
                 if (evtName in screenBindings[screen]) {
@@ -764,10 +752,6 @@
             };
         };
 
-        this.isScreenName = function(screenName) {
-            return isScreenName(screenName);
-        }
-
         this.bindScreen = function(screen, handler) {
             screenBindings[screen] = handler;
         };