diff --git a/ChangeLog b/ChangeLog
index 040dcf10..0ae4f8ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,8 @@ Changes since version 0.80.0:
 - Fixed a bug about arranging subviews in a WMBox after removing a subview
   and a memleak occuring in the same situation.
 - Fixed a bug in wdread
+- Fixed bug with windows that have WM_HINTS.take_focus = False. These windows
+  will not receive focus at all.
 
 
 Changes since version 0.70.0:
diff --git a/src/window.c b/src/window.c
index 019fb5d1..e5a7b889 100644
--- a/src/window.c
+++ b/src/window.c
@@ -494,6 +494,14 @@ wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace)
         //WSETUFLAG(wwin, sunken, 0);
 
     WSETUFLAG(wwin, no_shadeable, WFLAGP(wwin, no_titlebar));
+    
+    
+    /* windows that have takefocus=False shouldn't take focus at all */
+    if (wwin->focus_mode == WFM_NO_INPUT) {
+	/* dont use WSETUFLAG, since this was not an attribute change 
+	 * made by the user */
+	wwin->user_flags.no_focusable = 1;
+    }
 }