diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index 226e0a9a56a81810d007ab29e7e49414d1b13226..7207d6c6baaf8145a67a77d1a3f4e288938ef1ef 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -1617,9 +1617,9 @@ BOOL LLViewerInput::handleMouse(LLWindow *window_impl, LLCoordGL pos, MASK mask,
 
         // If the first LMB click is handled by the menu, skip the following double click
         static bool skip_double_click = false;
-        if (clicktype == CLICK_LEFT && down && !is_toolmgr_action)
+        if (clicktype == CLICK_LEFT && down)
         {
-            skip_double_click = handled;
+            skip_double_click = is_toolmgr_action ? false : handled;
         }
 
         if (double_click_sp && down)