diff --git a/GpApp/Settings.cpp b/GpApp/Settings.cpp
index b20e317..01de43d 100644
--- a/GpApp/Settings.cpp
+++ b/GpApp/Settings.cpp
@@ -918,8 +918,6 @@ void DisplayUpdate (Dialog *theDialog)
 	SetDialogItemValue(theDialog, k32BitColorItem, wasDepthPref == 32);
 	SetDialogItemValue(theDialog, kScaleResolutionItem, (short)isAutoScale);
 	SetDialogItemValue(theDialog, kUseICCProfileItem, (short)isUseICCProfile);
-
-	wasFullscreenPref = PortabilityLayer::HostDisplayDriver::GetInstance()->IsFullScreen();
 	SetDialogItemValue(theDialog, kFullScreenItem, wasFullscreenPref);
 	
 	FrameDisplayIcon(theDialog, StdColors::Red());
@@ -1286,6 +1284,8 @@ void DoSettingsMain (void)
 	leaving = false;
 	nextRestartChange = false;
 
+	wasFullscreenPref = PortabilityLayer::HostDisplayDriver::GetInstance()->IsFullScreen();
+
 	Window* exclWindow = prefDlg->GetWindow();
 
 	PortabilityLayer::WindowManager::GetInstance()->SwapExclusiveWindow(exclWindow);	// Push exclusive window