diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index 5c10a8ed4d..f7650a2328 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -1,4 +1,4 @@
-#review-panel
+#review-panel(style=showRichText ? "top: 32px" : "")
 	.rp-in-editor-widgets
 		a.rp-track-changes-indicator(
 			href
diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less
index 42c6c15daf..c0db61aef0 100644
--- a/services/web/public/stylesheets/app/editor.less
+++ b/services/web/public/stylesheets/app/editor.less
@@ -93,6 +93,8 @@
 	height: @editor-toolbar-height;
 	background-color: @editor-toolbar-bg;
 	overflow: hidden;
+	position: relative;
+	z-index: 10; // Prevent track changes showing over toolbar
 }
 
 .loading-screen {
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 05b45afc59..800a25618f 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -793,12 +793,6 @@
 	}
 }
 
-.toolbar-editor {
-	.rp-size-expanded & {
-		margin-right: @review-panel-width;
-	}
-}
-
 .rp-toggle {
 	display: inline-block;
 	vertical-align: middle;