diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index a11d650ac4..2c65090687 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -28,7 +28,7 @@
 			a.rp-add-comment-btn(
 				href
 				ng-if="reviewPanel.entries[editor.open_doc_id]['add-comment'] != null && permissions.comment"
-				ng-click="addNewComment();"
+				ng-mousedown="addNewComment($event);"
 			)
 				i.fa.fa-comment
 				|  #{translate("add_comment")}
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.js b/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.js
index d3572502ca..86469d3918 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.js
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/editor-navigation-toolbar-root.js
@@ -78,7 +78,10 @@ const EditorNavigationToolbarRoot = React.memo(
     }, [chatIsOpen, setChatIsOpen, markMessagesAsRead])
 
     const toggleReviewPanelOpen = useCallback(
-      () => setReviewPanelOpen(value => !value),
+      event => {
+        event.preventDefault()
+        setReviewPanelOpen(value => !value)
+      },
       [setReviewPanelOpen]
     )
 
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/track-changes-toggle-button.js b/services/web/frontend/js/features/editor-navigation-toolbar/components/track-changes-toggle-button.js
index 5af087017b..f8477645c6 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/track-changes-toggle-button.js
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/track-changes-toggle-button.js
@@ -11,7 +11,7 @@ function TrackChangesToggleButton({ trackChangesIsOpen, disabled, onClick }) {
 
   return (
     <div className="toolbar-item">
-      <button disabled={disabled} className={classes} onClick={onClick}>
+      <button disabled={disabled} className={classes} onMouseDown={onClick}>
         <i className="review-icon" />
         <p className="toolbar-label">{t('review')}</p>
       </button>
diff --git a/services/web/frontend/js/features/source-editor/extensions/changes/change-manager.ts b/services/web/frontend/js/features/source-editor/extensions/changes/change-manager.ts
index 5fa7863312..c39a03f194 100644
--- a/services/web/frontend/js/features/source-editor/extensions/changes/change-manager.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/changes/change-manager.ts
@@ -13,7 +13,7 @@ import { debounce } from 'lodash'
 
 // With less than this number of entries, don't bother culling to avoid
 // little UI jumps when scrolling.
-const CULL_AFTER = 100
+const CULL_AFTER = Infinity // Note: was 100 but couldn't scroll to see items outside the viewport
 
 export const dispatchEditorEvent = (type: string, payload?: unknown) => {
   window.setTimeout(() => {
@@ -291,24 +291,25 @@ export const createChangeManager = (
         acceptChanges(payload)
         view.dispatch(buildChangeMarkers())
         broadcastChange()
-        dispatchFocusChangedEvent(view.state)
         break
       }
 
       case 'changes:reject': {
         view.dispatch(rejectChanges(payload))
-        dispatchFocusChangedEvent(view.state)
+        broadcastChange()
         break
       }
 
       case 'comment:select_line': {
         selectCurrentLine()
+        broadcastChange()
         break
       }
 
       case 'comment:add': {
         addComment(payload.offset, payload.length, payload.threadId)
         collapseSelection()
+        broadcastChange()
         break
       }
 
@@ -329,9 +330,6 @@ export const createChangeManager = (
       case 'loaded_threads': {
         view.dispatch(buildChangeMarkers())
         broadcastChange()
-        window.setTimeout(() => {
-          dispatchFocusChangedEvent(view.state)
-        }, 0)
         break
       }
 
@@ -359,12 +357,9 @@ export const createChangeManager = (
     }
   }
 
-  /**
-   *
-   */
-  const broadcastChange = () => {
+  const broadcastChange = debounce(() => {
     dispatchEditorEvent('track-changes:changed')
-  }
+  }, 50)
 
   /**
    * When the editor content, focus, size, viewport or selection changes,
@@ -450,9 +445,13 @@ export const createChangeManager = (
   return {
     initialize() {
       addListeners()
-      dispatchEditorEvent('track-changes:changed')
+      broadcastChange()
     },
     handleUpdate(update: ViewUpdate) {
+      if (update.geometryChanged && !update.docChanged) {
+        broadcastChange()
+      }
+
       if (updateSetsVerticalOverflow(update)) {
         ignoreGeometryChangesUntil = Date.now() + 50 // ignore changes for 50ms
       } else if (
diff --git a/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js b/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
index 1131ba682c..cc043682da 100644
--- a/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
+++ b/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
@@ -724,7 +724,8 @@ export default App.controller(
       return $scope.toggleReviewPanel()
     }
 
-    $scope.addNewComment = function () {
+    $scope.addNewComment = function (e) {
+      e.preventDefault()
       $scope.$broadcast('comment:start_adding')
       return $scope.toggleReviewPanel()
     }
diff --git a/services/web/frontend/js/ide/review-panel/directives/reviewPanelSorted.js b/services/web/frontend/js/ide/review-panel/directives/reviewPanelSorted.js
index c46d1a4436..3f353f48b7 100644
--- a/services/web/frontend/js/ide/review-panel/directives/reviewPanelSorted.js
+++ b/services/web/frontend/js/ide/review-panel/directives/reviewPanelSorted.js
@@ -146,12 +146,11 @@ export default App.directive('reviewPanelSorted', $timeout => ({
           visibility: 'visible',
         })
         focused_entry.$indicator_el.css({ top: focused_entry_top })
-        // use screenPos.height and screenPos.editorPaddingTop if set
+        // use screenPos.height if set
         screenPosHeight = focusedEntryScreenPos.height ?? line_height
         positionLayoutEl(
           focused_entry.$callout_el,
-          focusedEntryScreenPos.y +
-            (focusedEntryScreenPos.editorPaddingTop ?? 0),
+          focusedEntryScreenPos.y,
           focused_entry_top,
           screenPosHeight
         )