diff --git a/static/js/ui.js b/static/js/ui.js
index ba0acbc393..d56f9dd9ae 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -1902,11 +1902,15 @@ $(function () {
     $(".fixed-app .app-main").css("max-width", (1400 + sbWidth) + "px");
     $(".fixed-app .column-middle").css("margin-left", (250 + sbWidth) + "px");
 
+    $(".column-right").css("right", sbWidth + "px");
+    $(".app-main .right-sidebar").css("padding-left", (10 + sbWidth) + "px");
+
     $("#compose").css("left", "-" + sbWidth + "px");
     $(".compose-content").css({"left": sbWidth + "px",
                                "margin-right": (250 + sbWidth) + "px"});
     $("#compose-container").css("max-width", (1400 + sbWidth) + "px");
 
+    $("head").append("<style> @media (max-width: 975px) { .compose-content, .header-main .column-middle { margin-right: " + sbWidth + "px !important; } } </style>");
    }
 
 });
diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 0089241040..94829a63dd 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -313,6 +313,11 @@ a:hover code {
     display: table-row;
 }
 
+#left-sidebar #user-list,
+#left-sidebar #group-pm-list {
+    padding-left: 10px;
+}
+
 .edit-profile {
     font-weight: 300;
     font-size: 12px;
@@ -3833,9 +3838,6 @@ div.edit_bot {
         margin-right: 0px;
     }
 
-    .app .column-middle-inner {
-        margin-right: 15px;
-    }
 }
 
 @media (max-width: 775px) {
@@ -3883,12 +3885,15 @@ div.edit_bot {
         margin-right: 0px;
     }
 
-    .column-middle-inner,
-    .app-main .column-middle .column-middle-inner {
+    .column-middle-inner {
         margin-left:  0px;
         margin-right: 15px;
     }
 
+    .app-main .column-middle .column-middle-inner {
+        margin-right: 0px;
+    }
+
     .skinny-user-gravatar {
         position: absolute;
         top: 0px;