Index: ps/trunk/binaries/data/config/default.cfg
===================================================================
--- ps/trunk/binaries/data/config/default.cfg
+++ ps/trunk/binaries/data/config/default.cfg
@@ -26,6 +26,11 @@
 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false
 
+; Switches between real fullscreen and borderless window on a full display size.
+borderless.fullscreen = true
+; Hides a window border in the windowed mode.
+borderless.window = false
+
 ; Show detailed tooltips (Unit stats)
 showdetailedtooltips = false
 
Index: ps/trunk/source/ps/VideoMode.cpp
===================================================================
--- ps/trunk/source/ps/VideoMode.cpp
+++ ps/trunk/source/ps/VideoMode.cpp
@@ -244,7 +244,18 @@
 {
 	Uint32 flags = 0;
 	if (fullscreen)
-		flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+	{
+		bool borderlessFullscreen = true;
+		CFG_GET_VAL("borderless.fullscreen", borderlessFullscreen);
+		flags |= borderlessFullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN;
+	}
+	else
+	{
+		bool borderlessWindow = false;
+		CFG_GET_VAL("borderless.window", borderlessWindow);
+		if (borderlessWindow)
+			flags |= SDL_WINDOW_BORDERLESS;
+	}
 
 	if (!m_Window)
 	{