diff --git a/static/templates/settings/display-settings.handlebars b/static/templates/settings/display-settings.handlebars
index 28ea00469d..ebe230d33b 100644
--- a/static/templates/settings/display-settings.handlebars
+++ b/static/templates/settings/display-settings.handlebars
@@ -85,19 +85,6 @@
         <h3 class="inline-block light">Emoji style</h3>
         <div class="alert-notification" id="emoji-settings-status"></div>
 
-        <div class="input-group side-padded-container">
-            <label class="checkbox">
-                <input type="checkbox" name="translate_emoticons" id="translate_emoticons"
-                       {{#if page_params.translate_emoticons}}
-                       checked="checked"
-                       {{/if}} />
-                <span></span>
-            </label>
-            <label for="translate_emoticons" class="inline-block">
-                {{t "Translate emoticons (convert <code>:)</code> to 😃 in messages)" }}
-            </label>
-        </div>
-
         <div class="input-group side-padded-container">
             <div class="emojiset_choices grey-box">
                 {{#each page_params.emojiset_choices }}
@@ -118,5 +105,18 @@
                 {{/each}}
             </div>
         </div>
+
+        <div class="input-group side-padded-container">
+            <label class="checkbox">
+                <input type="checkbox" name="translate_emoticons" id="translate_emoticons"
+                       {{#if page_params.translate_emoticons}}
+                       checked="checked"
+                       {{/if}} />
+                <span></span>
+            </label>
+            <label for="translate_emoticons" class="inline-block">
+                {{t "Translate emoticons (convert <code>:)</code> to 😃 in messages)" }}
+            </label>
+        </div>
     </form>
 </div>