--- ../blackbox/src/Toolbar.cc	2005-04-12 17:38:00.000000000 +1000
+++ src/Toolbar.cc	2007-05-20 11:11:17.000000000 +1000
@@ -782,7 +782,7 @@
 
 
 void Toolbar::toggleAutoHide(void) {
-  bool do_auto_hide = !_screen->resource().toolbarOptions().auto_hide;
+  bool do_auto_hide = _screen->resource().toolbarOptions().auto_hide;
 
   updateStrut();
   if (_screen->slit())
@@ -793,6 +793,10 @@
     if (hide_timer->isTiming()) hide_timer->stop();
     hide_timer->fireTimeout();
   }
+  else if (do_auto_hide && !hidden) {
+    // Force the toolbar to hide
+    hide_timer->start();
+  }
 }