diff --git a/ChangeLog b/ChangeLog
index 34d6b015..6fb00073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Changes since version 0.63.1:
 - fixed messup in get-{wings,wutil,wraster}-flags
 - fixed #wmdatadir# substitution in wmaker.inst 
 	(Seiichi SATO <sato@cvs-net.co.jp>)
+- Removed spurious focus disabling for GNUstep applications - but retain
+  code that lets GNUstep apps control their window titlebar.
+	(Richard Frith-Macdonald <rfm@gnu.org>)
 
 
 Changes since version 0.63.0:
diff --git a/src/actions.c b/src/actions.c
index f1be29b2..7afffd32 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -160,7 +160,7 @@ wSetFocusTo(WScreen *scr, WWindow  *wwin)
 
     if (wwin == NULL) {
 	XSetInputFocus(dpy, scr->no_focus_win, RevertToParent, timestamp);
-	if (old_focused && !old_focused->flags.is_gnustep) {
+	if (old_focused) {
 	    wWindowUnfocus(old_focused);
 	}
 	if (oapp) {
@@ -174,7 +174,7 @@ wSetFocusTo(WScreen *scr, WWindow  *wwin)
 	wKWMSendEventMessage(NULL, WKWMFocusWindow);
 #endif
 	return;
-    } else if (old_scr != scr && old_focused && !old_focused->flags.is_gnustep) {
+    } else if (old_scr != scr && old_focused) {
         wWindowUnfocus(old_focused);
     }
 
@@ -237,8 +237,7 @@ wSetFocusTo(WScreen *scr, WWindow  *wwin)
 	}
     }
 
-    if (!wwin->flags.is_gnustep)
-	wWindowFocus(wwin, focused);
+    wWindowFocus(wwin, focused);
 
     if (napp && !wasfocused) {
 #ifdef USER_MENU