diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp
index bb134fe21f..a708a7cb74 100644
--- a/src/univ/toolbar.cpp
+++ b/src/univ/toolbar.cpp
@@ -649,6 +649,23 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
         PerformAction( wxACTION_BUTTON_RELEASE, numArg );
 
         PerformAction( wxACTION_BUTTON_CLICK, numArg );
+                        
+        // Write by Danny Raynor to change state again.                
+        if( tool->IsToggled() )
+        {
+            // Change toggle state to false
+            tool->Toggle(false);
+        }
+  
+        // Check button still pressed or not
+        if( tool->IsInverted() )
+        {        
+            PerformAction( wxACTION_TOOLBAR_RELEASE, numArg );      
+        }
+    
+        // Set mouse leave toolbar button range (If still in the range,
+        // toolbar button would get focus again
+        PerformAction( wxACTION_TOOLBAR_LEAVE, numArg );
     }
     else if ( action == wxACTION_TOOLBAR_PRESS )
     {