diff --git a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
index 23fa79994d..9439df9d4f 100644
--- a/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
+++ b/services/web/frontend/js/features/source-editor/components/codemirror-toolbar.tsx
@@ -181,6 +181,11 @@ const Toolbar = memo(function Toolbar() {
         id="ol-cm-toolbar-wrapper"
         className={classNames('ol-cm-toolbar-wrapper', {
           'ol-cm-toolbar-wrapper-indented': showReviewPanelHeader,
+          // The border is only needed when the header is flush with the
+          // toolbar, which is the case when tabs are disabled and the review
+          // panel is shown
+          'ol-cm-toolbar-wrapper-needs-border':
+            showReviewPanelHeader && !tabsVisible,
         })}
       >
         <div
diff --git a/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts b/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
index 7cc74b529d..c217cdede7 100644
--- a/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/toolbar/toolbar-panel.ts
@@ -152,9 +152,10 @@ const toolbarTheme = EditorView.theme({
       padding: 0,
     },
   },
-  '.ol-cm-toolbar-wrapper-indented .ol-cm-toolbar-button-group:first-child': {
-    borderLeft: '1px solid rgba(125, 125, 125, 0.3)',
-  },
+  '.ol-cm-toolbar-wrapper-needs-border .ol-cm-toolbar-button-group:first-child':
+    {
+      borderLeft: '1px solid rgba(125, 125, 125, 0.3)',
+    },
   '.ol-cm-toolbar-button': {
     display: 'inline-flex',
     alignItems: 'center',