diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less
index 3ab46ec0f..c0872ea7d 100755
--- a/r2/r2/public/static/css/reddit.less
+++ b/r2/r2/public/static/css/reddit.less
@@ -2179,10 +2179,11 @@ li.searchfacet {
 }
 
 .popup {
-    position: fixed;
+    position: absolute;
     left: 10%;
     background-color: white;
-    top: 40px;
+    top: 0;
+    margin-top: 40px;
     width: 80%;
     text-align: left;
     z-index: 1001;
diff --git a/r2/r2/public/static/js/login.js b/r2/r2/public/static/js/login.js
index d38108e14..db8667b12 100644
--- a/r2/r2/public/static/js/login.js
+++ b/r2/r2/public/static/js/login.js
@@ -272,6 +272,7 @@ r.ui.LoginPopup.prototype = $.extend(new r.ui.Base(), {
         $.request("new_captcha", {id: this.$el.attr('id')})
         this.$el
             .find(".cover-msg").toggle(!!notice).end()
+            .find('.popup').css('top', $(document).scrollTop()).end()
             .show()
     },