diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp
index 9de9582f5e..cd205b2dd2 100644
--- a/src/generic/toolbkg.cpp
+++ b/src/generic/toolbkg.cpp
@@ -275,10 +275,11 @@ void wxToolbook::Realize()
     if (m_needsRealizing)
     {
         GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);
-        
+
+        int remap = wxSystemOptions::GetOptionInt(wxT("msw.remap"));
         wxSystemOptions::SetOption(wxT("msw.remap"), 0);
         GetToolBar()->Realize();
-        wxSystemOptions::SetOption(wxT("msw.remap"), 1);
+        wxSystemOptions::SetOption(wxT("msw.remap"), remap);
     }
     
     m_needsRealizing = false;