diff --git a/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts b/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
index 19e82c46af..913e1ebb8e 100644
--- a/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
+++ b/services/web/frontend/js/features/ide-react/context/review-panel/hooks/use-review-panel-state.ts
@@ -1177,6 +1177,10 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
       handleLayoutChange()
     }
 
+    const editorTrackChangesVisibilityChanged = () => {
+      handleLayoutChange({ async: true, animate: false })
+    }
+
     const editorFocusChanged = (
       selectionOffsetStart: number,
       selectionOffsetEnd: number,
@@ -1328,6 +1332,11 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
           break
         }
 
+        case 'track-changes:visibility_changed': {
+          editorTrackChangesVisibilityChanged()
+          break
+        }
+
         case 'focus:changed': {
           const { from, to, empty, updateType } = payload
           editorFocusChanged(from, to, !empty, updateType)
@@ -1343,6 +1352,11 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
           toggleTrackChangesFromKbdShortcut()
           break
         }
+
+        case 'toggle-review-panel': {
+          toggleReviewPanel()
+          break
+        }
       }
     }