diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowMoveAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowMoveAction.java
index 5de1d7310c15..5d3c84fd3260 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowMoveAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowMoveAction.java
@@ -166,6 +166,7 @@ public final class ToolWindowMoveAction extends DumbAwareAction implements FusAw
   @Override
   public void update(@NotNull AnActionEvent e) {
     ToolWindow toolWindow = getToolWindow(e);
+    e.getPresentation().setVisible(toolWindow != null);
     e.getPresentation().setEnabled(toolWindow != null && !myAnchor.isApplied(toolWindow));
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowViewModeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowViewModeAction.java
index 0b97a6d9bbef..a370d86bbe18 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowViewModeAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowViewModeAction.java
@@ -152,7 +152,7 @@ public class ToolWindowViewModeAction extends DumbAwareToggleAction implements F
   @Override
   public void update(@NotNull AnActionEvent e) {
     super.update(e);
-    e.getPresentation().setEnabled(getToolWindow(e) != null);
+    e.getPresentation().setEnabledAndVisible(getToolWindow(e) != null);
   }
 
   @Override