diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XAddToWatchesAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XAddToWatchesAction.java
index c4bb274400ea..66f22bbfd4f1 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XAddToWatchesAction.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XAddToWatchesAction.java
@@ -55,9 +55,9 @@ class XAddToWatchesAction extends XDebuggerTreeActionBase {
     if (view == null && project != null) {
       XDebugSession session = XDebuggerManager.getInstance(project).getCurrentSession();
       if (session != null) {
-        return ((XDebugSessionImpl)session).getSessionTab().getWatchesView();
+        view = ((XDebugSessionImpl)session).getSessionTab().getWatchesView();
       }
     }
-    return null;
+    return view;
   }
 }
\ No newline at end of file