diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
index 83d82e75e..514146c09 100644
--- a/plugins/vst_base/VstPlugin.cpp
+++ b/plugins/vst_base/VstPlugin.cpp
@@ -229,7 +229,9 @@ void VstPlugin::showEditor( QWidget * _parent, bool isEffect )
 		return;
 	}
 
-	QX11EmbedContainer * xe = new QX11EmbedContainer;
+	vstSubWin * sw = new vstSubWin( gui->mainWindow()->workspace() );
+
+	QX11EmbedContainer * xe = new QX11EmbedContainer(sw);
 	m_pluginWidget = xe;
 	m_pluginWidget->setFixedSize( m_pluginGeometry );
 	m_pluginWidget->setWindowTitle( name() );
@@ -238,8 +240,6 @@ void VstPlugin::showEditor( QWidget * _parent, bool isEffect )
 
 	if( _parent == NULL )
 	{
-		vstSubWin * sw = new vstSubWin(
-					gui->mainWindow()->workspace() );
 		sw->setWidget( m_pluginWidget );
 
 		if( isEffect )
diff --git a/src/gui/X11EmbedContainer.cpp b/src/gui/X11EmbedContainer.cpp
index f5a22eb87..99e0dc48d 100644
--- a/src/gui/X11EmbedContainer.cpp
+++ b/src/gui/X11EmbedContainer.cpp
@@ -356,8 +356,8 @@ QX11EmbedContainer::QX11EmbedContainer(QWidget *parent)
 	Q_D(QX11EmbedContainer);
 	//XSetErrorHandler(x11ErrorHandler);
 
+	//setAttribute(Qt::WA_DontCreateNativeAncestors);
 	setAttribute(Qt::WA_NativeWindow);
-	setAttribute(Qt::WA_DontCreateNativeAncestors);
 	createWinId();
 
 	setFocusPolicy(Qt::StrongFocus);
@@ -369,8 +369,8 @@ QX11EmbedContainer::QX11EmbedContainer(QWidget *parent)
 	// Everybody gets a focus proxy, but only one toplevel container's
 	// focus proxy is actually in use.
 	d->focusProxy = new QWidget(this);
+	//d->focusProxy->setAttribute(Qt::WA_DontCreateNativeAncestors);
 	d->focusProxy->setAttribute(Qt::WA_NativeWindow);
-	d->focusProxy->setAttribute(Qt::WA_DontCreateNativeAncestors);
 	d->focusProxy->createWinId();
 	d->focusProxy->winId();
 	d->focusProxy->setGeometry(-1, -1, 1, 1);