diff --git a/src/App.scss b/src/App.scss
index 70769fad55..dd43c5caa6 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -502,6 +502,10 @@ nav {
   .text-format {
     float: right;
   }
+
+  div {
+    padding-top: 5px;
+  }
 }
 
 .visibility-notice {
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 8b8eeae0ff..543ab52798 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -34,11 +34,14 @@
       </textarea>
       <div class="visibility-tray">
         <span class="text-format">
-          <select v-model="newStatus.contentType" class="form-control">
-            <option value="text/plain">{{$t('post_status.content_type.plain_text')}}</option>
-            <option value="text/html">HTML</option>
-            <option value="text/markdown">Markdown</option>
-          </select>
+          <label for="post-content-type" class="select">
+            <select id="post-content-type" v-model="newStatus.contentType" class="form-control">
+              <option value="text/plain">{{$t('post_status.content_type.plain_text')}}</option>
+              <option value="text/html">HTML</option>
+              <option value="text/markdown">Markdown</option>
+            </select>
+            <i class="icon-down-open"></i>
+          </label>
         </span>
 
         <div v-if="scopeOptionsEnabled">