diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index ecd92bc7..bba81280 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -475,6 +475,13 @@ void Session::getWindowDimensions(bool fullScreen,
 
                 width -= left + right;
                 height -= top + bottom;
+
+                // If the stream window can fit within the usable drawing area with 1:1
+                // scaling, do that rather than filling the screen.
+                if (m_StreamConfig.width < width && m_StreamConfig.height < height) {
+                    width = m_StreamConfig.width;
+                    height = m_StreamConfig.height;
+                }
             }
         }
         else {