diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 5ee6b3c5..64f9f0d4 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -748,6 +748,15 @@ input[type=checkbox] {
 .popup p {
   margin: 5px 0
 }
+.popup select {
+  background: #fff;
+  padding: 2px;
+  height: 24px;
+  border-radius: 3px;
+  border: 1px solid #ccc;
+  outline: none;
+  min-width: 105px;
+}
 .column {
   float: left;
   width: 50%;
diff --git a/src/templates/pad.html b/src/templates/pad.html
index afa5547e..29516def 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -201,22 +201,34 @@
                     <input type="checkbox" id="options-linenoscheck" checked>
                     <label for="options-linenoscheck" data-l10n-id="pad.settings.linenocheck"></label>
                 </p>
-                <p data-l10n-id="pad.settings.fontType">
-                    Font type:
-                    <select id="viewfontmenu">
-                        <option value="normal" data-l10n-id="pad.settings.fontType.normal"></option>
-                        <option value="monospace" data-l10n-id="pad.settings.fontType.monospaced"></option>
-                    </select>
-                </p>
-                <p data-l10n-id="pad.settings.language">
-                    Language:
-                    <select id="languagemenu">
-                        <% for (lang in langs) { %>
-                        <option value="<%=lang%>"><%=langs[lang]%></option>
-                        <% } %>
-                    </select>
-                </p>
                 <% e.end_block(); %>
+                <table>
+                    <% e.begin_block("mySettings.dropdowns"); %>
+                    <tr>
+                        <td>
+                            <label for="viewfontmenu" data-l10n-id="pad.settings.fontType">Font type:</label>
+                        </td>
+                        <td>
+                            <select id="viewfontmenu">
+                                <option value="normal" data-l10n-id="pad.settings.fontType.normal"></option>
+                                <option value="monospace" data-l10n-id="pad.settings.fontType.monospaced"></option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <label for="languagemenu" data-l10n-id="pad.settings.language">Language:</label>
+                        </td>
+                        <td>
+                            <select id="languagemenu">
+                                <% for (lang in langs) { %>
+                                <option value="<%=lang%>"><%=langs[lang]%></option>
+                                <% } %>
+                            </select>
+                        </td>
+                    </tr>
+                    <% e.end_block(); %>
+                </table>
             </div>
             <div class="column">
                 <% e.begin_block("globalSettings"); %>