diff --git a/Kit/module/popup.swift b/Kit/module/popup.swift
index 8771f6ff..8757ed1d 100644
--- a/Kit/module/popup.swift
+++ b/Kit/module/popup.swift
@@ -200,6 +200,10 @@ internal class PopupView: NSView {
                 self.recalculateHeight(size)
             }
         }
+        
+        if let documentView = self.body.documentView {
+            documentView.scroll(NSPoint(x: 0, y: documentView.bounds.size.height))
+        }
     }
     internal func disappear() {}
     
@@ -230,7 +234,7 @@ internal class PopupView: NSView {
         ))
         
         if let documentView = self.body.documentView {
-            documentView.scroll(NSPoint(x: 0, y: documentView.bounds.size.height))
+            documentView.scroll(NSPoint(x: 0, y: self.body.documentVisibleRect.origin.y))
         }
     }
 }