diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 51a70d5f4..9d5a8f6a2 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -1,3 +1,7 @@
+#add-to-shelves.dropdown-menu, #remove-from-shelves.dropdown-menu {
+  max-height: 300px;
+  overflow-y: auto;
+}
 
 .tooltip.bottom .tooltip-inner {
   font-size: 13px;
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index b273ef9ee..69ec460f7 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -294,7 +294,7 @@
                 {% if current_user.is_authenticated %}
                     {% if current_user.shelf.all() or g.shelves_access %}
                         <div id="shelf-actions" class="btn-toolbar" role="toolbar">
-                            <div class="btn-group" role="group" aria-label="Add to shelves">
+                            <div class="btn-group dropup" role="group" aria-label="Add to shelves">
                                 <button id="add-to-shelf" type="button"
                                         class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown"
                                         aria-haspopup="true" aria-expanded="false">