diff --git a/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java b/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
index 3c719c347ae3..5c474e17516b 100644
--- a/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
+++ b/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
@@ -28,7 +28,7 @@ public class FocusDebuggerAction extends AnAction implements DumbAware {
   private FocusDrawer myFocusDrawer;
 
   public FocusDebuggerAction() {
-    if (Boolean.getBoolean("idea.ui.debug.mode")) {
+    if (Boolean.getBoolean("idea.ui.debug.mode") || Boolean.getBoolean("idea.ui.focus.debugger")) {
       ApplicationManager.getApplication().invokeLater(() -> perform());
     }
   }
diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
index 252a545493ca..45f11f82f9d6 100644
--- a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
+++ b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.impl.ActionButton;
 import com.intellij.openapi.actionSystem.impl.ActionMenu;
 import com.intellij.openapi.actionSystem.impl.ActionMenuItem;
 import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.ex.EditorGutterComponentEx;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.keymap.Keymap;
@@ -98,7 +99,6 @@ public class UiInspectorAction extends DumbAwareAction implements LightEditCompa
   private static final String RENDERER_BOUNDS = "clicked renderer";
   private static final int MAX_DEEPNESS_TO_DISCOVER_FIELD_NAME = 8;
   private final List<MouseShortcut> myMouseShortcuts = new ArrayList<>();
-  private final UiInspector myInspector;
 
   public UiInspectorAction() {
     setEnabledInModalContext(true);
@@ -128,7 +128,9 @@ public class UiInspectorAction extends DumbAwareAction implements LightEditCompa
         }
       }
     }, AWTEvent.MOUSE_EVENT_MASK);
-    myInspector = new UiInspector(null);
+    if (Boolean.getBoolean("idea.ui.debug.mode") || Boolean.getBoolean("idea.ui.inspector")) {
+      ApplicationManager.getApplication().invokeLater(() -> new UiInspector(null));
+    }
   }
 
   private void updateMouseShortcuts() {
@@ -153,7 +155,7 @@ public class UiInspectorAction extends DumbAwareAction implements LightEditCompa
     closeAllInspectorWindows();
 
     if (event instanceof MouseEvent && event.getComponent() != null) {
-      myInspector.processMouseEvent(project, (MouseEvent)event);
+      new UiInspector(project).processMouseEvent(project, (MouseEvent)event);
       return;
     }
     if (component == null) {
@@ -161,7 +163,7 @@ public class UiInspectorAction extends DumbAwareAction implements LightEditCompa
     }
 
     assert component != null;
-    myInspector.showInspector(project, component);
+    new UiInspector(project).showInspector(project, component);
   }
 
   @Override