diff --git a/extras/AudioPluginHost/Source/HostStartup.cpp b/extras/AudioPluginHost/Source/HostStartup.cpp
index 3e7cc70968..2aca5df3d7 100644
--- a/extras/AudioPluginHost/Source/HostStartup.cpp
+++ b/extras/AudioPluginHost/Source/HostStartup.cpp
@@ -149,7 +149,11 @@ static PluginHostApp& getApp()                    { return *dynamic_cast<PluginH
 ApplicationProperties& getAppProperties()         { return *getApp().appProperties; }
 ApplicationCommandManager& getCommandManager()    { return getApp().commandManager; }
 
-bool isOnTouchDevice()                            { return Desktop::getInstance().getMainMouseSource().isTouch(); }
+bool isOnTouchDevice()
+{
+    static bool isTouch = Desktop::getInstance().getMainMouseSource().isTouch();
+    return isTouch;
+}
 
 // This kicks the whole thing off..
 START_JUCE_APPLICATION (PluginHostApp)
diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
index b8bdc95e0e..9591c88ac8 100644
--- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
+++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
@@ -1189,11 +1189,8 @@ void GraphDocumentComponent::init()
 
     if (isOnTouchDevice())
     {
-        if (isOnTouchDevice())
-        {
-            titleBarComponent.reset (new TitleBarComponent (*this));
-            addAndMakeVisible (titleBarComponent.get());
-        }
+        titleBarComponent.reset (new TitleBarComponent (*this));
+        addAndMakeVisible (titleBarComponent.get());
 
         pluginListBoxModel.reset (new PluginListBoxModel (pluginListBox, pluginList));
 
@@ -1206,11 +1203,8 @@ void GraphDocumentComponent::init()
                                                                               0, 2, 0, 2,
                                                                               true, true, true, false));
 
-        if (isOnTouchDevice())
-        {
-            addAndMakeVisible (pluginListSidePanel);
-            addAndMakeVisible (mobileSettingsSidePanel);
-        }
+        addAndMakeVisible (pluginListSidePanel);
+        addAndMakeVisible (mobileSettingsSidePanel);
     }
 }