diff --git a/src/event.cxx b/src/event.cxx
index d37f791..69a83ea 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -1624,6 +1624,8 @@ void CEvent::SetFullScreen (bool bFullScreen)
 
     m_bFullScreen = bFullScreen;
     SDL_SetWindowFullscreen (g_window, bFullScreen ? SDL_WINDOW_FULLSCREEN : 0);
+    SDL_SetWindowBordered (g_window, bFullScreen ? SDL_FALSE : SDL_TRUE);
+    SDL_SetWindowGrab (g_window, bFullScreen ? SDL_TRUE : SDL_FALSE);
     SDL_SetWindowPosition (g_window,
                            SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);