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 46935ae0ea95..22490c63f831 100644
--- a/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
+++ b/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
@@ -37,7 +37,7 @@ public class FocusDebuggerAction extends AnAction implements DumbAware {
   private FocusDrawer myFocusDrawer;
 
   public FocusDebuggerAction() {
-    if (Boolean.getBoolean("focus.debug")) {
+    if (Boolean.getBoolean("idea.ui.debug.mode")) {
       ApplicationManager.getApplication().invokeLater(() -> actionPerformed(null));
     }
   }
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 b8fd3d2140f3..b2642d40a260 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.notification.Notifications;
 import com.intellij.notification.NotificationsManager;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.roots.ui.configuration.actions.IconWithTextAction;
 import com.intellij.openapi.ui.DialogWrapper;
@@ -80,6 +81,12 @@ public class UiInspectorAction extends ToggleAction implements DumbAware {
 
   private UiInspector myInspector;
 
+  public UiInspectorAction() {
+    if (Boolean.getBoolean("idea.ui.debug.mode")) {
+      ApplicationManager.getApplication().invokeLater(() -> setSelected(null, true));
+    }
+  }
+
   @Override
   public boolean isSelected(AnActionEvent e) {
     return myInspector != null;