diff --git a/Changes.txt b/Changes.txt
index 107129068..30c463ed8 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -63,6 +63,8 @@
 
   * Fixed missing debug color update when switching display type.
 
+  * 'Fill to scanline' now works for scanlines above current scanline too
+
   * For UNIX systems: in the ROM launcher, when using symlinks use the
     symlink pathname instead of the underlying filesystem pathname.
 
diff --git a/docs/debugger.html b/docs/debugger.html
index a0189a47e..b8e3e88f0 100644
--- a/docs/debugger.html
+++ b/docs/debugger.html
@@ -1089,11 +1089,8 @@ as illustrated:</p>
 <p><img src="graphics/debugger_tiaoutcmenu.png"></p>
 <p>The options are as follows:</p>
 <ul>
-	<li><b>Fill to scanline</b>: If you've already started a partial frame
-	draw (ie, the frame is already partially 'greyed' out), selecting this
-	option will draw all scanlines up to the vertical position where the
-	mouse was clicked. Note that if you weren't in partial-frame mode,
-	this option will have no effect.</li>
+	<li><b>Fill to scanline</b>: This option will draw all scanlines up to the
+  vertical position where the	mouse was clicked.</li>
 	<li><b>Toggle breakpoint</b>: Will toggle a conditional breakpoint at the
 	scanline where the mouse was clicked. You can also use
 	the Prompt Tab commands to list and turn off the breakpoint.</li>
diff --git a/src/debugger/gui/TiaOutputWidget.cxx b/src/debugger/gui/TiaOutputWidget.cxx
index b7fce2c16..2cefc2abf 100644
--- a/src/debugger/gui/TiaOutputWidget.cxx
+++ b/src/debugger/gui/TiaOutputWidget.cxx
@@ -119,13 +119,10 @@ void TiaOutputWidget::handleCommand(CommandSender* sender, int cmd, int data, in
       if(rmb == "scanline")
       {
         ostringstream command;
-        int lines = myClickY + ystart;
-        if(instance().console().tia().isRendering())
-        {
-          lines -= instance().console().tia().scanlines();
-          if(lines < 0)
-            lines += instance().console().tia().scanlinesLastFrame();
-        }
+        int lines = myClickY + ystart - instance().console().tia().scanlines();
+
+        if(lines < 0)
+          lines += instance().console().tia().scanlinesLastFrame();
         if(lines > 0)
         {
           command << "scanline #" << lines;