diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index f4c4f1533..6fecef4ca 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -542,24 +542,20 @@ void ToolManager::Reset()
          floater = bar->GetParent();
       }
 
+      // Decide which dock.
       if (ndx == SelectionBarID 
 #ifdef EXPERIMENTAL_SPECTRAL_EDITING
          || ndx == SpectralSelectionBarID
 #endif
          )
-      {
          dock = mBotDock;
-
-         wxCommandEvent e;
-         bar->GetEventHandler()->ProcessEvent(e);
-      }
       else
-      {
          dock = mTopDock;
-         bar->ReCreateButtons();
-      }
 
+      // Recreate bar buttons (and resize it)
+      bar->ReCreateButtons();
       bar->EnableDisableButtons();
+
 #if 0
       if( bar->IsResizable() )
       {
@@ -567,6 +563,7 @@ void ToolManager::Reset()
       }
 #endif
 
+      // Hide some bars.
       if( ndx == MeterBarID
 #ifdef EXPERIMENTAL_SPECTRAL_EDITING
          || ndx == SpectralSelectionBarID
@@ -579,10 +576,10 @@ void ToolManager::Reset()
          || ndx == SelectionBarID
 #endif
          )
-      {
          expose = false;
-      }
 
+      // Next condition will alwys (?) be true, as the reset configuration is
+      // with no floating toolbars.
       if( dock != NULL )
       {
          // when we dock, we reparent, so bar is no longer a child of floater.