diff --git a/evennia/web/static/webclient/js/plugins/goldenlayout.js b/evennia/web/static/webclient/js/plugins/goldenlayout.js
index 68ea5710bd..aca6f8b836 100644
--- a/evennia/web/static/webclient/js/plugins/goldenlayout.js
+++ b/evennia/web/static/webclient/js/plugins/goldenlayout.js
@@ -300,6 +300,14 @@ let goldenlayout = (function () {
         let typelist   = document.getElementById("typelist");
         let updatelist = document.getElementById("updatelist");
 
+        if(tab?.componentName !== 'options')
+        {
+            window.plugins["default_in"].setKeydownFocus(true);
+        }
+        else {
+            window.plugins["default_in"].setKeydownFocus(false);
+        }
+
         if( renamebox ) {
             closeRenameDropdown();
         }
diff --git a/evennia/web/static/webclient/js/plugins/options2.js b/evennia/web/static/webclient/js/plugins/options2.js
index 24acd4b314..54c8dea553 100644
--- a/evennia/web/static/webclient/js/plugins/options2.js
+++ b/evennia/web/static/webclient/js/plugins/options2.js
@@ -75,14 +75,12 @@ let options2 = (function () {
                     .click( function () {
                         optionsContainer = null;
                         tab.contentItem.remove();
-                        window.plugins["default_in"].setKeydownFocus(true);
                     });
                     optionsContainer = tab.contentItem;
                 }
             });
             main.parent.addChild( optionsComponent );
 
-            window.plugins["default_in"].setKeydownFocus(false);
         } else {
             optionsContainer.remove();
             optionsContainer = null;
@@ -150,7 +148,7 @@ let options2 = (function () {
 
         // don't claim this Prompt as completed.
         return false;
-    }
+    }   
 
     //
     //
@@ -183,7 +181,7 @@ let options2 = (function () {
         onOptionsUI: onOptionsUI,
         onPrompt: onPrompt,
         onOptionCheckboxChanged: onOptionCheckboxChanged,
-        onOpenCloseOptions: onOpenCloseOptions,
+        onOpenCloseOptions: onOpenCloseOptions
     }
 })();
 window.plugin_handler.add("options2", options2);