diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index d51f8b16d..6e43859a4 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2142,6 +2142,11 @@ titleWithRepresentedFilename(NSString *representedFilename)
               frameRect.size.height = _minimumSize.height;
             }
         }
+      else
+        {
+          /* Move top edge of the window to the screen limit */
+          frameRect.origin.y -= NSMaxY(frameRect) - NSMaxY(screenRect);
+        }
     }
 
   if (NSWidth(frameRect) < NSWidth(screenRect))
@@ -2180,6 +2185,11 @@ titleWithRepresentedFilename(NSString *representedFilename)
               frameRect.size.width = _minimumSize.width;
             }
         }
+      else
+        {
+          /* Move right edge of the window to the screen limit */
+          frameRect.origin.x -= NSMaxX(frameRect) - NSMaxX(screenRect);
+        }
     }
 
   return frameRect;