diff --git a/src/toolbars/ToolBar.cpp b/src/toolbars/ToolBar.cpp
index 073d6049e..aa53e48b2 100644
--- a/src/toolbars/ToolBar.cpp
+++ b/src/toolbars/ToolBar.cpp
@@ -197,7 +197,8 @@ void ToolBarResizer::OnEnter( wxMouseEvent & event )
 
 void ToolBarResizer::OnLeave( wxMouseEvent & event )
 {
-   mOrigFocus = nullptr;
+   if (!GetCapture())
+      mOrigFocus = nullptr;
 }
 
 void ToolBarResizer::OnMotion( wxMouseEvent & event )