diff --git a/js/forum/src/components/ActivityPage.js b/js/forum/src/components/ActivityPage.js
index 58c8b5e61..5b2948f37 100644
--- a/js/forum/src/components/ActivityPage.js
+++ b/js/forum/src/components/ActivityPage.js
@@ -89,7 +89,9 @@ export default class ActivityPage extends UserPage {
     this.loading = true;
     this.activity = [];
 
-    m.redraw();
+    // Redraw, but only if we're not in the middle of a route change.
+    m.startComputation();
+    m.endComputation();
 
     this.loadResults().then(this.parseResults.bind(this));
   }
diff --git a/less/forum/Composer.less b/less/forum/Composer.less
index b9c58035a..a74f459be 100644
--- a/less/forum/Composer.less
+++ b/less/forum/Composer.less
@@ -209,6 +209,7 @@
       right: 0;
       margin: 0;
       height: auto;
+      border-radius: 0;
     }
   }
   .Composer-controls {
@@ -271,12 +272,12 @@
 
 @media @desktop-up {
   .Composer:not(.fullScreen) {
-    margin-left: -20px;
-    margin-right: 180px;
+    margin-left: 205px;
+    margin-right: -20px;
 
-    .App--index & {
-      margin-left: 205px;
-      margin-right: -20px;
+    .App--discussion & {
+      margin-left: -20px;
+      margin-right: 180px;
     }
   }
 }