diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
index 10863ad59..be407a5bd 100644
--- a/plugins/vst_base/VstPlugin.cpp
+++ b/plugins/vst_base/VstPlugin.cpp
@@ -584,19 +584,6 @@ void VstPlugin::showUI()
 		QWidget * w = pluginWidget();
 		if( w )
 		{
-#		ifdef LMMS_BUILD_WIN32
-			// hide sw, plugin window wrapper on win32
-			// this is obtained from pluginWidget()
-			if( isEffect )
-			{
-				w->setWindowFlags( Qt::FramelessWindowHint );
-				w->setAttribute( Qt::WA_TranslucentBackground );
-			}
-			else
-			{
-				w->setWindowFlags( Qt::WindowCloseButtonHint );
-			}
-#		endif
 			w->show();
 		}
 	}
diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp
index 9a4851b49..78b9c0d23 100644
--- a/src/gui/SetupDialog.cpp
+++ b/src/gui/SetupDialog.cpp
@@ -140,8 +140,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
 						   "displaywaveform").toInt() ),
 	m_disableAutoQuit(ConfigManager::inst()->value( "ui",
 						   "disableautoquit").toInt() ),
-	m_vstEmbedMethod(ConfigManager::inst()->value( "ui",
-						   "vstembedmethod", "xembed"))
+	m_vstEmbedMethod( ConfigManager::inst()->vstEmbedMethod() )
 {
 	setWindowIcon( embed::getIconPixmap( "setup_general" ) );
 	setWindowTitle( tr( "Setup LMMS" ) );