diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp
index 0cf2e3615..97af436bc 100644
--- a/Source/PluginEditor.cpp
+++ b/Source/PluginEditor.cpp
@@ -88,14 +88,14 @@ PluginEditor::PluginEditor(PluginProcessor& p)
         // NEVER touch pluginConstrainer outside of plugin mode!
         pluginConstrainer.setMinimumSize(850, 650);
         setUseBorderResizer(true);
-#if JUCE_LINUX
-        OSUtils::updateX11Constraints(getPeer()->getNativeHandle());
-#endif
     }
     else {
         constrainer.setMinimumSize(850, 650);
+
+    #if JUCE_LINUX
+        OSUtils::updateX11Constraints(getPeer()->getNativeHandle());
+    #endif
     }
-    
 
 
     mainMenuButton.setButtonText(Icons::Menu);
diff --git a/Source/Utility/OSUtils.cpp b/Source/Utility/OSUtils.cpp
index ace82f13d..35796b471 100644
--- a/Source/Utility/OSUtils.cpp
+++ b/Source/Utility/OSUtils.cpp
@@ -12,7 +12,6 @@
 #include <juce_gui_basics/juce_gui_basics.h>
 
 
-#include "Config.h"
 #include "OSUtils.h"
 
 #if defined(__APPLE__)
@@ -171,7 +170,7 @@ OSUtils::KeyboardLayout OSUtils::getKeyboardLayout()
 
 void OSUtils::updateX11Constraints(void* handle)
 {
-    if(ProjectInfo::isStandalone) {
+    if(handle) {
         juce::XWindowSystem::getInstance()->updateConstraints(reinterpret_cast<::Window>(handle));
     }
 }