diff --git a/src/univ/scrthumb.cpp b/src/univ/scrthumb.cpp
index 2fbd3ed888..d5f3946880 100644
--- a/src/univ/scrthumb.cpp
+++ b/src/univ/scrthumb.cpp
@@ -218,10 +218,6 @@ bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const
             m_control->OnThumbDragEnd(GetThumbPos(event));
         }
 
-        // release the mouse and free capture data
-        delete m_captureData;
-        wxConstCast(this, wxScrollThumb)->m_captureData = NULL;
-
         m_control->SetShaftPartState(shaftPart, wxCONTROL_PRESSED, false);
     }
     else // another mouse button released
@@ -230,6 +226,10 @@ bool wxScrollThumb::HandleMouse(const wxMouseEvent& event) const
         return false;
     }
 
+    // release the mouse and free capture data
+    delete m_captureData;
+    wxConstCast(this, wxScrollThumb)->m_captureData = NULL;
+
     return true;
 }