diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 18a979bd78..dd045f1b35 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2209,7 +2209,12 @@ void LLViewerWindow::reshape(S32 width, S32 height)
 		BOOL maximized = mWindow->getMaximized();
 		gSavedSettings.setBOOL("WindowMaximized", maximized);
 
-		if (!maximized)
+//<FS:KC - fix for EXP-1777/EXP-1832>
+        LLCoordScreen window_size;
+		if (!maximized
+			&& mWindow->getSize(&window_size))
+//		if (!maximized)
+//</FS:KC - fix for EXP-1777/EXP-1832>
 		{
 			U32 min_window_width=gSavedSettings.getU32("MinWindowWidth");
 			U32 min_window_height=gSavedSettings.getU32("MinWindowHeight");
@@ -2217,8 +2222,12 @@ void LLViewerWindow::reshape(S32 width, S32 height)
 			mWindow->setMinSize(min_window_width, min_window_height);
 
 			// Only save size if not maximized
-			gSavedSettings.setU32("WindowWidth", mWindowRectRaw.getWidth());
-			gSavedSettings.setU32("WindowHeight", mWindowRectRaw.getHeight());
+//<FS:KC - fix for EXP-1777/EXP-1832>
+//			gSavedSettings.setU32("WindowWidth", mWindowRectRaw.getWidth());
+//			gSavedSettings.setU32("WindowHeight", mWindowRectRaw.getHeight());
+			gSavedSettings.setU32("WindowWidth", window_size.mX);
+			gSavedSettings.setU32("WindowHeight", window_size.mY);
+//</FS:KC - fix for EXP-1777/EXP-1832>
 		}
 
 		LLViewerStats::getInstance()->setStat(LLViewerStats::ST_WINDOW_WIDTH, (F64)width);