diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp
index c50327838..d0d54992f 100644
--- a/src/AudacityApp.cpp
+++ b/src/AudacityApp.cpp
@@ -1187,7 +1187,7 @@ bool AudacityApp::OnInit()
 
 #if defined(__WXMAC__)
    // Disable window animation
-   wxSystemOptions::SetOption(wxMAC_WINDOW_PLAIN_TRANSITION, 1);
+   wxSystemOptions::SetOption(wxMAC_WINDOW_PLAIN_TRANSITION, 0);
 #endif
 
 #ifdef AUDACITY_NAME
diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index fa50ab039..8a9a9adc0 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -666,7 +666,7 @@ void ToolManager::ReadConfig()
 
 #if defined(__WXMAC__)
    // Disable window animation
-   wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
+   //wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
 #endif
 
    // Change to the bar root
@@ -852,7 +852,7 @@ void ToolManager::ReadConfig()
 
 #if defined(__WXMAC__)
    // Reinstate original transition
-   wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
+   //wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
 #endif
 
    if (!someFound)
@@ -1055,7 +1055,7 @@ void ToolManager::OnMouse( wxMouseEvent & event )
 
 #if defined(__WXMAC__)
    // Disable window animation
-   wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
+   //wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
 #endif
 
    // Retrieve the event position
@@ -1189,7 +1189,7 @@ void ToolManager::OnMouse( wxMouseEvent & event )
 
 #if defined(__WXMAC__)
    // Reinstate original transition
-   wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
+   //wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
 #endif
 }
 
@@ -1236,14 +1236,14 @@ void ToolManager::OnTimer( wxTimerEvent & event )
 
 #if defined(__WXMAC__)
       // Disable window animation
-      wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
+      //wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
 #endif
 
       mIndicator->Show( !state );
 
 #if defined(__WXMAC__)
       // Disable window animation
-      wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
+      //wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
 #endif
    }
 
@@ -1313,7 +1313,7 @@ void ToolManager::OnGrabber( GrabberEvent & event )
    {
 #if defined(__WXMAC__)
       // Disable window animation
-      wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
+      //wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
 #endif
 
       // Adjust the starting position
@@ -1334,7 +1334,7 @@ void ToolManager::OnGrabber( GrabberEvent & event )
 
 #if defined(__WXMAC__)
       // Reinstate original transition
-      wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
+      //wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
 #endif
    }
    else
diff --git a/src/widgets/wxPanelWrapper.cpp b/src/widgets/wxPanelWrapper.cpp
index db8474b0c..95970fa73 100644
--- a/src/widgets/wxPanelWrapper.cpp
+++ b/src/widgets/wxPanelWrapper.cpp
@@ -20,7 +20,7 @@ wxPanelWrapper::wxPanelWrapper(wxWindow * parent, wxWindowID id,
 
 void wxPanelWrapper::DoCharHook(wxKeyEvent &event)
 {
-#ifdef __WXMAC
+#ifdef __WXMAC__
    // Compensate for the regressions in TAB key navigation
    // due to the switch to wxWidgets 3.0.2
    if (event.GetKeyCode() == WXK_TAB) {