diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 5a145510e54..0d19c3b230d 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -233,11 +233,8 @@ createWindow(
 	);
 
 	if (window) {
-
-		// Install a new protocol for this window - so we can overide
-		// the default window closure mechanism.
-
-		XSetWMProtocols(m_display, window->getXWindow(), &m_delete_window_atom, 1);
+		// Both are now handle in GHOST_WindowX11.cpp
+		// Focus and Delete atoms.
 
 		if (window->getValid()) {
 			// Store the pointer to the window 
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 3785b325eaf..34ce0409d53 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -372,7 +372,8 @@ GHOST_WindowX11(
 	XDestroyImage( mask_image );
 	
 	xwmhints->initial_state = NormalState;
-	xwmhints->flags         = IconPixmapHint|IconMaskHint|StateHint;
+	xwmhints->input= True;
+	xwmhints->flags= InputHint|IconPixmapHint|IconMaskHint|StateHint;
 	XSetWMHints(display, m_window, xwmhints );
 	XFree(xwmhints);
 	// done setting the icon