Avoid deselecting watch items on right-click menu popup

IDE/src/IDEApp.bf

@@ -568,6 +568,23 @@ namespace IDE
 			}
 		}
 
+		public bool MenuHasFocus
+		{
+			get
+			{
+				for (var window in mWindows)
+				{
+					var widgetWindow = window as WidgetWindow;
+					if ((widgetWindow != null) && (widgetWindow.mHasFocus))
+					{
+						if (widgetWindow.mRootWidget is MenuContainer)
+							return true;
+					}
+				}
+				return false;
+			}
+		}
+
 		[CallingConvention(.Stdcall),CLink]
 		static extern void IDEHelper_ProgramStart();
 		[CallingConvention(.Stdcall),CLink]

IDE/src/ui/WatchPanel.bf

@@ -4117,7 +4117,7 @@ namespace IDE.ui
 
             CheckClearDirtyWatches();
 
-			if ((mDeselectOnFocusLost) && (!HasFocus) && (mListView.mFindWidget == null))
+			if ((mDeselectOnFocusLost) && (!HasFocus) && (mListView.mFindWidget == null) && (!gApp.MenuHasFocus))
 				mListView.GetRoot().SelectItemExclusively(null);
 
 			//mListView.m