diff --git a/osdep/w32_keyboard.c b/osdep/w32_keyboard.c
index 52221e6565..57988ec0ec 100644
--- a/osdep/w32_keyboard.c
+++ b/osdep/w32_keyboard.c
@@ -93,6 +93,8 @@ static const struct keymap appcmd_map[] = {
     {APPCOMMAND_LAUNCH_MAIL,         MP_KEY_MAIL},
     {APPCOMMAND_BROWSER_FAVORITES,   MP_KEY_FAVORITES},
     {APPCOMMAND_BROWSER_SEARCH,      MP_KEY_SEARCH},
+    {APPCOMMAND_BROWSER_BACKWARD,    MP_KEY_GO_BACK},
+    {APPCOMMAND_BROWSER_FORWARD,     MP_KEY_GO_FORWARD},
     {0, 0}
 };
 
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index e6a4670d2d..5672ea31a4 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -1480,11 +1480,11 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
         handle_mouse_down(w32,
             HIWORD(wParam) == 1 ? MP_MBTN_BACK : MP_MBTN_FORWARD,
             GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
-        break;
+        return TRUE;
     case WM_XBUTTONUP:
         handle_mouse_up(w32,
             HIWORD(wParam) == 1 ? MP_MBTN_BACK : MP_MBTN_FORWARD);
-        break;
+        return TRUE;
     case WM_DISPLAYCHANGE:
         force_update_display_info(w32);
         break;