diff --git a/src/aui/floatpane.cpp b/src/aui/floatpane.cpp
index 2695121ff4..628626de9d 100644
--- a/src/aui/floatpane.cpp
+++ b/src/aui/floatpane.cpp
@@ -203,6 +203,13 @@ void wxAuiFloatingFrame::OnClose(wxCloseEvent& evt)
 
 void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
 {
+    // Always sync pane's floating_pos with frame's position
+    if (m_ownerMgr)
+    {
+        m_ownerMgr->GetPane(m_paneWindow).
+            floating_pos = event.GetPosition();
+    }
+
     if (!m_solidDrag)
     {
         // systems without solid window dragging need to be
@@ -242,14 +249,6 @@ void wxAuiFloatingFrame::OnMoveEvent(wxMoveEvent& event)
         m_last2Rect = m_lastRect;
         m_lastRect = winRect;
 
-        // However still update the internally stored position to avoid
-        // snapping back to the old one later.
-        if (m_ownerMgr)
-        {
-            m_ownerMgr->GetPane(m_paneWindow).
-                floating_pos = winRect.GetPosition();
-        }
-
         return;
     }
 #endif