diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index f9314ada30..a9d96062e0 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -622,18 +622,24 @@ static LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message,
 static void win32_set_position_from_config(void)
 {
    settings_t *settings  = config_get_ptr();
+   int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
+   int title_bar_height = GetSystemMetrics(SM_CYCAPTION);
+   int menu_bar_height = GetSystemMetrics(SM_CYMENU);
    if (!settings->bools.video_window_save_positions)
       return;
 
    g_win32_pos_x     = settings->uints.window_position_x;
    g_win32_pos_y     = settings->uints.window_position_y;
-   g_win32_pos_width = settings->uints.window_position_width;
-   g_win32_pos_height= settings->uints.window_position_height;
+   g_win32_pos_width = settings->uints.window_position_width + border_thickness * 2;
+   g_win32_pos_height= settings->uints.window_position_height + border_thickness * 2 + title_bar_height;
 }
 
 static void win32_save_position(void)
 {
    RECT rect;
+   int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
+   int title_bar_height = GetSystemMetrics(SM_CYCAPTION);
+   int menu_bar_height = GetSystemMetrics(SM_CYMENU);
    WINDOWPLACEMENT placement;
    settings_t *settings     = config_get_ptr();
    memset(&placement, 0, sizeof(placement));
@@ -655,8 +661,8 @@ static void win32_save_position(void)
       {
          settings->uints.window_position_x      = g_win32_pos_x;
          settings->uints.window_position_y      = g_win32_pos_y;
-         settings->uints.window_position_width  = g_win32_pos_width;
-         settings->uints.window_position_height = g_win32_pos_height;
+         settings->uints.window_position_width  = g_win32_pos_width - border_thickness * 2;
+         settings->uints.window_position_height = g_win32_pos_height - border_thickness * 2 - title_bar_height - (settings->bools.ui_menubar_enable ? menu_bar_height : 0);
       }
    }
 }