diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index 0c94b3838d..c1961f1973 100644
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -198,7 +198,8 @@ void wxPopupTransientWindow::PopHandlers()
             m_handlerPopup = NULL;
         }
 
-        m_child->ReleaseMouse();
+        if (m_child->HasCapture())
+            m_child->ReleaseMouse();
         m_child = NULL;
     }