diff --git a/src/sass/_theme_badge.sass b/src/sass/_theme_badge.sass
index b24ec10f4..a85746cc6 100644
--- a/src/sass/_theme_badge.sass
+++ b/src/sass/_theme_badge.sass
@@ -35,8 +35,9 @@
       color: $black
   &.shift-up
     height: auto
-    max-height: 100%
-    overflow-y: scroll
+    max-height: calc(100vh - 50px)
+    overflow-y: auto
+    overscroll-behavior: contain
   &.shift-up .rst-other-versions
     display: block
   .rst-other-versions
@@ -60,7 +61,7 @@
         color: $section-background-color
   &.rst-badge
     width: auto
-    bottom: 20px
+    bottom: 50px
     right: 20px
     left: auto
     border: none
@@ -74,6 +75,8 @@
       line-height: 30px
     &.shift-up .rst-current-version
       text-align: right
+      position: sticky
+      top: 0
       .fa-book
         float: left
       .icon-book