diff --git a/Sources/Plasma/Apps/plClient/plClient.cpp b/Sources/Plasma/Apps/plClient/plClient.cpp
index 968a3736..6cff6ef1 100644
--- a/Sources/Plasma/Apps/plClient/plClient.cpp
+++ b/Sources/Plasma/Apps/plClient/plClient.cpp
@@ -2252,8 +2252,6 @@ void plClient::IDetectAudioVideoSettings()
     if(rec->GetG3DHALorHEL() == hsG3DDeviceSelector::kHHD3DRefDev)
         refDevice = true;
 
-    plPipeline::fDefaultPipeParams.Width = hsG3DDeviceSelector::kDefaultWidth;
-    plPipeline::fDefaultPipeParams.Height = hsG3DDeviceSelector::kDefaultHeight;
     plPipeline::fDefaultPipeParams.ColorDepth = hsG3DDeviceSelector::kDefaultDepth;
 #if defined(HS_DEBUGGING) || defined(DEBUG)
     plPipeline::fDefaultPipeParams.Windowed = true;
@@ -2261,6 +2259,18 @@ void plClient::IDetectAudioVideoSettings()
     plPipeline::fDefaultPipeParams.Windowed = false;
 #endif
 
+    // Use current desktop resolution for fullscreen mode
+    if(!plPipeline::fDefaultPipeParams.Windowed)
+    {
+        plPipeline::fDefaultPipeParams.Width = GetSystemMetrics(SM_CXSCREEN);
+        plPipeline::fDefaultPipeParams.Height = GetSystemMetrics(SM_CYSCREEN);
+    }
+    else
+    {
+        plPipeline::fDefaultPipeParams.Width = hsG3DDeviceSelector::kDefaultWidth;
+        plPipeline::fDefaultPipeParams.Height = hsG3DDeviceSelector::kDefaultHeight;
+    }
+
     plPipeline::fDefaultPipeParams.Shadows = 0;
     // enable shadows if TnL is available, meaning not an intel extreme.
     if(rec->GetG3DHALorHEL() == hsG3DDeviceSelector::kHHD3DTnLHalDev)