diff --git a/web/source/kmwuitoolbar.ts b/web/source/kmwuitoolbar.ts
index d4e18379b4..47512e52b6 100644
--- a/web/source/kmwuitoolbar.ts
+++ b/web/source/kmwuitoolbar.ts
@@ -756,14 +756,11 @@ if(!window['keyman']['ui']['name']) {
      **/
     ui.showOSK = function(event)
     {
-      keymanweb['activatingUI'](true);
-      // As the Toolbar UI uses more advanced minification, we must preserve the 'osk' field name.
       let osk = keymanweb['osk'];
-
       if(!osk) {
-        keymanweb['activatingUI'](false);
         return;
       }
+      keymanweb['activatingUI'](true);
       //Toggle OSK on or off
       if(osk && keymanweb['getActiveKeyboard']() != '')
       {