diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index 469a59bec..8e28c9b30 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -1168,6 +1168,7 @@ void ToolManager::OnMouse( wxMouseEvent & event )
       // Button was released...finish the drag
       // Transition the bar to a dock
       if (!mDidDrag) {
+         mPrevDock->RestoreConfiguration(mPrevConfiguration);
          DoneDragging();
          return;
       }
@@ -1197,8 +1198,11 @@ void ToolManager::OnMouse( wxMouseEvent & event )
          mDidDrag = true;
          wxPoint mp = event.GetPosition();
          mp = mParent->ClientToScreen(mp);
-         if (!mDragWindow)
+         if (!mDragWindow) {
+            // We no longer have control
+            mPrevDock->GetConfiguration().Remove( mDragBar );
             UndockBar(mp);
+         }
       }
 
       // Make toolbar follow the mouse
@@ -1398,10 +1402,6 @@ void ToolManager::OnIndicatorCreate( wxWindowCreateEvent & event )
 
 void ToolManager::UndockBar( wxPoint mp )
 {
-   mPrevDock->Undock(mDragBar);
-   mPrevSlot = mPrevDock->GetConfiguration().Find(mDragBar);
-   mPrevDock->GetConfiguration().Remove(mDragBar);
-
 #if defined(__WXMAC__)
    // Disable window animation
    wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
@@ -1448,6 +1448,8 @@ void ToolManager::OnGrabber( GrabberEvent & event )
    if (mDragBar->IsDocked()) {
       mPrevDock = dynamic_cast<ToolDock*>(mDragBar->GetParent());
       wxASSERT(mPrevDock);
+      mPrevSlot = mPrevDock->GetConfiguration().Find(mDragBar);
+      mPrevDock->WrapConfiguration(mPrevConfiguration);
    }
    else
       mPrevPosition = mDragBar->GetParent()->GetPosition();