diff --git a/static/styles/settings.css b/static/styles/settings.css
index c6396d2221..12ee313561 100644
--- a/static/styles/settings.css
+++ b/static/styles/settings.css
@@ -572,8 +572,7 @@ input[type=checkbox].inline-block {
     padding: 6px;
 }
 
-.add-new-emoji-box #emoji-file-name,
-.add-new-emoji-box #emoji_file_input_error {
+.add-new-emoji-box #emoji-file-name {
     width: 0;
     top: -19px;
     left: 3px;
@@ -585,6 +584,10 @@ input[type=checkbox].inline-block {
     font-style: italic;
 }
 
+#emoji_file_input_error {
+    vertical-align: middle;
+}
+
 .add-new-emoji-box #emoji-file-name {
     color: hsl(0, 0%, 66%);
 }
diff --git a/static/templates/settings/emoji-settings-admin.handlebars b/static/templates/settings/emoji-settings-admin.handlebars
index 1959cd96c0..ae5b11727d 100644
--- a/static/templates/settings/emoji-settings-admin.handlebars
+++ b/static/templates/settings/emoji-settings-admin.handlebars
@@ -17,12 +17,12 @@
                  id="emoji_file_input" value="{{t 'Upload emoji' }}"/>
                     <button class="button white rounded display-none" id="emoji_image_clear_button">{{t "Clear emoji image" }}</button>
                     <button class="button rounded" id="emoji_upload_button">{{t "Upload emoji" }}</button>
-                    <span id="emoji_file_input_error" class="text-error"></span>
                 </div>
                 <button id="admin_emoji_submit" type="submit" class="button rounded sea-green">
                     {{t 'Add emoji' }}
                 </button>
             </div>
+            <span id="emoji_file_input_error" class="text-error"></span>
         </div>
     </form>
     <div class="admin-table-wrapper">