diff --git a/client/css/post-upload.styl b/client/css/post-upload.styl
index a571d348..2b236b0c 100644
--- a/client/css/post-upload.styl
+++ b/client/css/post-upload.styl
@@ -15,11 +15,13 @@ $cancel-button-color = tomato
         &.inactive .skip-duplicates
         &.inactive .always-upload-similar
         &.inactive .pause-remain-on-error
+        &.inactive .upload-all-anonymous
         &.inactive #common-tags,
         &.uploading input[type=submit],
         &.uploading .skip-duplicates,
         &.uploading .always-upload-similar
         &.uploading .pause-remain-on-error
+        &.uploading .upload-all-anonymous
         &:not(.uploading) .cancel
             display: none
 
@@ -59,6 +61,15 @@ $cancel-button-color = tomato
     form>.messages
         margin-top: 1em
 
+    .control-strip
+        display: flex
+        flex-direction: column
+        gap: 0.5em
+
+    .control-options
+        display: flex
+        flex-direction: column
+
     .uploadables-container
         list-style-type: none
         margin: 0
diff --git a/client/html/post_upload.tpl b/client/html/post_upload.tpl
index de5d32ee..83968eb9 100644
--- a/client/html/post_upload.tpl
+++ b/client/html/post_upload.tpl
@@ -5,39 +5,41 @@
         <div class='control-strip'>
             <input type='submit' value='Upload all' class='submit'/>
 
-            <span class='skip-duplicates'>
-                <%= ctx.makeCheckbox({
-                    text: 'Skip duplicate',
-                    name: 'skip-duplicates',
-                    checked: false,
-                }) %>
-            </span>
+            <div class='control-options'>
+                <span class='skip-duplicates'>
+                    <%= ctx.makeCheckbox({
+                        text: 'Skip duplicate',
+                        name: 'skip-duplicates',
+                        checked: false,
+                    }) %>
+                </span>
 
-            <span class='always-upload-similar'>
-                <%= ctx.makeCheckbox({
-                    text: 'Force upload similar',
-                    name: 'always-upload-similar',
-                    checked: false,
-                }) %>
-            </span>
+                <span class='always-upload-similar'>
+                    <%= ctx.makeCheckbox({
+                        text: 'Force upload similar',
+                        name: 'always-upload-similar',
+                        checked: false,
+                    }) %>
+                </span>
 
-            <span class='pause-remain-on-error'>
-                <%= ctx.makeCheckbox({
-                    text: 'Pause on error',
-                    name: 'pause-remain-on-error',
-                    checked: true,
-                }) %>
-            </span>
+                <span class='pause-remain-on-error'>
+                    <%= ctx.makeCheckbox({
+                        text: 'Pause on error',
+                        name: 'pause-remain-on-error',
+                        checked: true,
+                    }) %>
+                </span>
 
-            <span class='upload-all-anonymous'>
-                <%= ctx.makeCheckbox({
-                    text: 'Upload anonymously',
-                    name: 'upload-all-anonymous',
-                    checked: false,
-                }) %>
-            </span>
+                <span class='upload-all-anonymous'>
+                    <%= ctx.makeCheckbox({
+                        text: 'Upload anonymously',
+                        name: 'upload-all-anonymous',
+                        checked: false,
+                    }) %>
+                </span>
+            </div>
 
-            <%= ctx.makeTextInput({placeholder: 'Common tags', id: 'common-tags', name: 'common-tags', style: 'margin-top:1em;'}) %>
+            <%= ctx.makeTextInput({placeholder: 'Common tags', id: 'common-tags', name: 'common-tags'}) %>
 
             <input type='button' value='Cancel' class='cancel'/>
         </div>
diff --git a/client/js/views/post_upload_view.js b/client/js/views/post_upload_view.js
index a1d8041a..212e1536 100644
--- a/client/js/views/post_upload_view.js
+++ b/client/js/views/post_upload_view.js
@@ -474,7 +474,7 @@ class PostUploadView extends events.EventTarget {
     }
 
     get _commonTagsInputNode() {
-        return this._formNode.querySelector('form [name=common-tags');
+        return this._formNode.querySelector('form [name=common-tags]');
     }
 }