diff --git a/framework/core/less/forum/composer.less b/framework/core/less/forum/composer.less
index 86fb8f60a..2f939dea2 100644
--- a/framework/core/less/forum/composer.less
+++ b/framework/core/less/forum/composer.less
@@ -15,6 +15,10 @@
   padding: 1px 0;
   margin: 0;
 
+  & > li {
+    display: inline-block;
+    margin-right: 10px;
+  }
   & h3 {
     margin: 0 0 10px;
     line-height: 1.5em;
@@ -24,7 +28,7 @@
       font-size: 16px;
       font-weight: normal;
     }
-    & input {
+    & input, & input[disabled] {
       background: none;
       border: 0;
       padding: 0;
@@ -89,11 +93,6 @@
   .composer-avatar {
     display: none;
   }
-  .composer-body {
-    & h3 input {
-      width: 100% !important;
-    }
-  }
 }
 
 // On larger screens, show the composer as a window at the bottom of the
@@ -113,8 +112,6 @@
     }
   }
   .composer {
-    margin-left: -20px;
-    margin-right: 180px;
     border-radius: @border-radius-base @border-radius-base 0 0;
     background: fade(@fl-body-bg, 95%);
     transform: translateZ(0); // Fix for Chrome bug where a transparent white background is actually gray
@@ -122,10 +119,6 @@
     height: 300px;
     .transition(~"background 0.2s");
 
-    .index-page & {
-      margin-left: 205px;
-      margin-right: -20px;
-    }
     &.active, &.full-screen {
       background: @fl-body-bg;
     }
@@ -143,6 +136,11 @@
       height: auto;
     }
   }
+  .composer-header {
+    .minimized & {
+      pointer-events: none;
+    }
+  }
   .composer-content {
     padding: 20px 20px 15px;
 
@@ -201,6 +199,18 @@
   }
 }
 
+@media @desktop, @desktop-hd {
+  .composer {
+    margin-left: -20px;
+    margin-right: 180px;
+
+    .index-page & {
+      margin-left: 205px;
+      margin-right: -20px;
+    }
+  }
+}
+
 
 // ------------------------------------
 // Text Editor