diff --git a/extras/juce demo/src/ApplicationStartup.cpp b/extras/juce demo/src/ApplicationStartup.cpp
index 3e4441c4d8..77c386c492 100644
--- a/extras/juce demo/src/ApplicationStartup.cpp	
+++ b/extras/juce demo/src/ApplicationStartup.cpp	
@@ -43,7 +43,7 @@ class JUCEDemoApplication : public JUCEApplication
 
        This is because the application object gets created before Juce has been properly
        initialised, so any embedded objects would also get constructed too soon.
-   */
+    */
     MainDemoWindow* theMainWindow;
 
 public:
diff --git a/extras/juce demo/src/MainDemoWindow.cpp b/extras/juce demo/src/MainDemoWindow.cpp
index 1f89954989..6ab82d9033 100644
--- a/extras/juce demo/src/MainDemoWindow.cpp	
+++ b/extras/juce demo/src/MainDemoWindow.cpp	
@@ -132,7 +132,7 @@ public:
           currentDemoId (0),
           demoSourceCodeText (0)
     {
-        invokeDirectly (showAudio, true);
+        invokeDirectly (showPathsAndTransforms, true);
     }
 
     ~ContentComp()
@@ -581,6 +581,10 @@ MainDemoWindow::~MainDemoWindow()
     // have to switch this off before deleting the content comp..
     setMenuBar (0);
 
+#if JUCE_MAC  // ..and also the main bar if we're using that on a Mac...
+    MenuBarModel::setMacMainMenu (0);
+#endif
+
     // setting our content component to 0 will delete the current one, and
     // that will in turn delete all its child components. You don't always
     // have to do this explicitly, because the base class's destructor will