diff --git a/ChangeLog b/ChangeLog
index 72a0cd88..f2c2d05e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,7 @@ Changes since version 0.80.2:
 - Updated Spanish translation of WPrefs (Alberto Gimenez <algibe@teleline.es>)
 - Fixed synchronization problem between hair cursor and mouse cursor in
   wmagnify with mouse cursor at the screen edge (Jon Diercks <jon@diercks.net>)
+- Fixed 2 focus switching related bugs (Allan Peramaki <aperamak@cc.hut.fi>)
 
 
 Changes since version 0.80.1:
diff --git a/src/window.c b/src/window.c
index 37ec27b5..9876b1af 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2809,17 +2809,17 @@ wWindowResetMouseGrabs(WWindow *wwin)
     if (!WFLAGP(wwin, no_bind_mouse)) {
 	/* grabs for Meta+drag */
 	wHackedGrabButton(AnyButton, MOD_MASK, wwin->client_win,
-			  True, ButtonPressMask, GrabModeSync, 
-			  GrabModeAsync, None, None);
+                          True, ButtonPressMask|ButtonReleaseMask,
+                          GrabModeSync, GrabModeAsync, None, None);
     }
     
     if (!wwin->flags.focused && !WFLAGP(wwin, no_focusable)
 	&& !wwin->flags.is_gnustep) {
 	/* the passive grabs to focus the window */
-/*	if (wPreferences.focus_mode == WKF_CLICK) */
+	/* if (wPreferences.focus_mode == WKF_CLICK) */
 	    XGrabButton(dpy, AnyButton, AnyModifier, wwin->client_win,
-			True, ButtonPressMask, GrabModeSync, GrabModeAsync,
-			None, None);
+                        True, ButtonPressMask|ButtonReleaseMask,
+                        GrabModeSync, GrabModeAsync, None, None);
     }
     XFlush(dpy);
 }