diff --git a/fedireads/static/format.css b/fedireads/static/format.css
index 747bcd4b..3ea1a920 100644
--- a/fedireads/static/format.css
+++ b/fedireads/static/format.css
@@ -489,6 +489,9 @@ dd {
     position: relative;
     z-index: 1;
 }
+.all-shelves h2 {
+    white-space: nowrap;
+}
 .all-shelves > div {
     flex-grow: 0;
 }
@@ -538,19 +541,14 @@ dd {
 .all-shelves input[type='radio'] {
     display: none;
 }
+.compose-popout input[type="radio"] {
+    display: none;
+}
 .compose-suggestion {
     display: none;
-    background-color: white;
-    z-index: 1;
-    width: -webkit-fill-available;
-    width: -moz-available;
-    box-shadow: 0 5px 10px rgba(0,0,0,0.45);
 }
 input:checked ~ .compose-suggestion {
     display: block;
-    position: absolute;
-    top: 5em;
-    left: 0;
 }
 .compose-suggestion .book-preview {
     background-color: #EEE;
diff --git a/fedireads/templates/snippets/covers_shelf.html b/fedireads/templates/snippets/covers_shelf.html
index f3217229..8521f841 100644
--- a/fedireads/templates/snippets/covers_shelf.html
+++ b/fedireads/templates/snippets/covers_shelf.html
@@ -16,16 +16,6 @@
                 <label for="book-{{ book.id }}-radio">
                     {% include 'snippets/book_cover.html' with book=book %}
                 </label>
-                <input name="book-{{ book.id }}" type="radio" id="book-{{ book.id }}-radio"></input>
-                <div class="compose-suggestion" id="compose-book-{{ book.id }}">
-                    <label class="close icon icon-close" for="book-{{ book.id }}-radio-close" onclick="hide_element(this)">
-                        <span class="hidden-text">Close</span>
-                    </label>
-                    <input name="book-{{ book.id }}" type="radio" id="book-{{ book.id }}-radio-close"></input>
-                    <div class="content-container">
-                        {% include 'snippets/create_status.html' with book=book user=request.user %}
-                    </div>
-                </div>
             </div>
             {% include 'snippets/shelve_button.html' with book=book %}
             </div>
@@ -38,5 +28,17 @@
 
 {% for shelf in shelves %}
     {% for book in shelf.books %}
-    {% endfor %}
+<div class="content-container compose-popout">
+    <input name="book-popout" type="radio" id="book-{{ book.id }}-radio"></input>
+    <div class="compose-suggestion" id="compose-book-{{ book.id }}">
+        <label class="close icon icon-close" for="book-{{ book.id }}-radio-close" onclick="hide_element(this)">
+            <span class="hidden-text">Close</span>
+        </label>
+        <input name="book-popout" type="radio" id="book-{{ book.id }}-radio-close"></input>
+        <div class="content-container">
+            {% include 'snippets/create_status.html' with book=book user=request.user %}
+        </div>
+    </div>
+</div>
+{% endfor %}
 {% endfor %}