diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index 4dcc9eb..b097e81 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -44,7 +44,7 @@ static struct {
 	int height;
 	int width_org;
 	int height_org;
-	bool fullscreen;
+	bool fullscreen, borderless;
 	bool has_focus;
 	bool running;
 } _wnd;
@@ -250,6 +250,12 @@ static void CALLBACK TrackMouseTimerProc(HWND hwnd, UINT msg, UINT event, DWORD
 	}
 }
 
+static bool IsNativeDisplayResolution(int w, int h) {
+	/* In a multi-display setup, this only checks the resolution of the primary display,
+	 * which is what OpenTTD uses for its window anyway. */
+	return (GetSystemMetrics(SM_CXSCREEN) == w && GetSystemMetrics(SM_CYSCREEN) == h);
+}
+
 /**
  * Instantiate a new window.
  * @param full_screen Whether to make a full screen window or not.
@@ -257,10 +263,19 @@ static void CALLBACK TrackMouseTimerProc(HWND hwnd, UINT msg, UINT event, DWORD
  */
 bool VideoDriver_Win32::MakeWindow(bool full_screen)
 {
-	_fullscreen = full_screen;
+	bool borderless_window = false;
+
+	/* If fullscreen was requested and this is the display's native resolution, use a borderless window instead */
+	if (full_screen && IsNativeDisplayResolution(_wnd.width_org, _wnd.height_org)) {
+		full_screen = false;
+		borderless_window = true;
+	}
+
+	_fullscreen = (full_screen || borderless_window);
 
 	/* recreate window? */
-	if ((full_screen || _wnd.fullscreen) && _wnd.main_wnd) {
+	/* TODO: recreating the window when toggling between windowed and borderless shouldn't be neccessary */
+	if ((full_screen || borderless_window || _wnd.fullscreen || _wnd.borderless) && _wnd.main_wnd) {
 		DestroyWindow(_wnd.main_wnd);
 		_wnd.main_wnd = 0;
 	}
@@ -320,7 +335,8 @@ bool VideoDriver_Win32::MakeWindow(bool full_screen)
 
 		showstyle = SW_SHOWNORMAL;
 		_wnd.fullscreen = full_screen;
-		if (_wnd.fullscreen) {
+		_wnd.borderless = borderless_window;
+		if (_wnd.fullscreen || _wnd.borderless) {
 			style = WS_POPUP;
 			SetRect(&r, 0, 0, _wnd.width_org, _wnd.height_org);
 		} else {
@@ -347,6 +363,10 @@ bool VideoDriver_Win32::MakeWindow(bool full_screen)
 
 			_wnd.main_wnd = CreateWindow(_T("OTTD"), Windowtitle, style, x, y, w, h, 0, 0, GetModuleHandle(NULL), 0);
 			if (_wnd.main_wnd == NULL) usererror("CreateWindow failed");
+
+			if (_wnd.borderless)
+				SetWindowPos(_wnd.main_wnd, HWND_TOP, 0, 0, w, h, SWP_NOOWNERZORDER | SWP_FRAMECHANGED);
+
 			ShowWindow(_wnd.main_wnd, showstyle);
 		}
 	}
@@ -862,7 +882,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			switch (wParam) {
 				case VK_RETURN:
 				case 'F': // Full Screen on ALT + ENTER/F
-					ToggleFullScreen(!_wnd.fullscreen);
+					ToggleFullScreen(!(_wnd.fullscreen || _wnd.borderless));
 					return 0;
 
 				case VK_MENU: // Just ALT
@@ -882,8 +902,8 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			if (wParam != SIZE_MINIMIZED) {
 				/* Set maximized flag when we maximize (obviously), but also when we
 				 * switched to fullscreen from a maximized state */
-				_window_maximize = (wParam == SIZE_MAXIMIZED || (_window_maximize && _fullscreen));
-				if (_window_maximize || _fullscreen) _bck_resolution = _cur_resolution;
+				_window_maximize = (wParam == SIZE_MAXIMIZED || (_window_maximize && _wnd.fullscreen));
+				if (_window_maximize || _wnd.fullscreen) _bck_resolution = _cur_resolution;
 				ClientSizeChanged(LOWORD(lParam), HIWORD(lParam));
 			}
 			return 0;