diff --git a/static/js/compose.js b/static/js/compose.js
index 323f7755e0..d811f88c7f 100644
--- a/static/js/compose.js
+++ b/static/js/compose.js
@@ -85,10 +85,13 @@ function hide_box() {
 
 function update_lock_icon_for_stream(stream_name) {
     var icon = $("#compose-lock-icon");
+    var streamfield = $("#stream");
     if (stream_data.get_invite_only(stream_name)) {
         icon.show();
+        streamfield.addClass("lock-padding");
     } else {
         icon.hide();
+        streamfield.removeClass("lock-padding");
     }
 }
 
diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index ddca740211..91b22df152 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -827,7 +827,7 @@ just a temporary hack.
 
 .compose_table #compose-lock-icon i {
     position: absolute;
-    left: -18px;
+    left: 5px;
     top: 3px;
 }
 
@@ -1354,18 +1354,24 @@ input.recipient_box {
     margin: 0px;
     height: 1em;
     border-radius: 3px;
-    padding-right: 18px;
-    min-width: 120px;
 }
 
 #stream.recipient_box {
     width: 20%;
     border-radius: 0px 3px 3px 0px;
     border-left: 0px;
+    min-width: 120px;
 }
+
 #subject.recipient_box {
-    width: 15%;
+    width: 25%;
+    min-width: 140px;
 }
+
+#stream.recipient_box.lock-padding {
+    padding-left: 18px;
+}
+
 #private_message_recipient.recipient_box {
     width: 100%;
 }
diff --git a/templates/zerver/compose.html b/templates/zerver/compose.html
index 4d61d0cfba..c43887b92e 100644
--- a/templates/zerver/compose.html
+++ b/templates/zerver/compose.html
@@ -34,12 +34,12 @@
               <td class="message_header_colorblock message_header_stream left_part">
               </td>
               <td class="right_part">
-                  <input type="text" class="recipient_box" name="stream" id="stream"
-                         maxlength="30"
-                         value="" placeholder="Stream" autocomplete="off" tabindex="120"/>
                   <span id="compose-lock-icon">
                     <i class="icon-vector-lock" title="This is an invite-only stream"></i>
                   </span>
+                  <input type="text" class="recipient_box" name="stream" id="stream"
+                         maxlength="30"
+                         value="" placeholder="Stream" autocomplete="off" tabindex="120"/>
                   <i class="icon-vector-narrow icon-vector-small"></i>
                   <input type="text" class="recipient_box" name="subject" id="subject"
                          maxlength="60"