diff --git a/package-lock.json b/package-lock.json
index 07151d9bcc..e5f33eec96 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3322,10 +3322,11 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.2.tgz",
-      "integrity": "sha512-Fq7eWOl1Rcbrfn6jD8FPCj9Auaxdm5nIK5RYOeW7ughnd/rY5AmPg6b+CfsG39ZHdwiwe8lde3q8uR7CF5S0yQ==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.7.1.tgz",
+      "integrity": "sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.4.0",
@@ -3391,10 +3392,11 @@
       }
     },
     "node_modules/@codemirror/language": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
-      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
+      "version": "6.10.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.6.tgz",
+      "integrity": "sha512-KrsbdCnxEztLVbB5PycWXFxas4EOyk/fPAfruSOnDDppevQgid2XZ+KbJ9u+fDikP/e7MW7HPBTvTb8JlZK9vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@codemirror/state": "^6.0.0",
         "@codemirror/view": "^6.23.0",
@@ -3428,19 +3430,23 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
-      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==",
-      "dev": true
-    },
-    "node_modules/@codemirror/view": {
-      "version": "6.35.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.0.tgz",
-      "integrity": "sha512-I0tYy63q5XkaWsJ8QRv5h6ves7kvtrBWjBcnf/bzohFJQc5c14a1AQRdE8QpPF9eMp5Mq2FMm59TCj1gDfE7kw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@codemirror/state": "^6.4.0",
+        "@marijn/find-cluster-break": "^1.0.0"
+      }
+    },
+    "node_modules/@codemirror/view": {
+      "version": "6.35.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.3.tgz",
+      "integrity": "sha512-ScY7L8+EGdPl4QtoBiOzE4FELp7JmNUsBvgBcCakXWM2uiv/K89VAzU3BMDscf0DsACLvTKePbd5+cFDTcei6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/state": "^6.5.0",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
@@ -6631,6 +6637,13 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
+    "node_modules/@marijn/find-cluster-break": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@maxmind/geoip2-node": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@maxmind/geoip2-node/-/geoip2-node-5.0.0.tgz",
@@ -41552,13 +41565,13 @@
         "@babel/preset-typescript": "^7.24.7",
         "@babel/register": "^7.24.6",
         "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#v6.18.2-overleaf-1",
-        "@codemirror/commands": "^6.6.2",
+        "@codemirror/commands": "^6.7.1",
         "@codemirror/lang-markdown": "^6.2.5",
-        "@codemirror/language": "^6.10.3",
+        "@codemirror/language": "^6.10.6",
         "@codemirror/lint": "^6.8.4",
         "@codemirror/search": "github:overleaf/codemirror-search#94f33f7fa6db95dadd3d7aed05c30cdde550835a",
-        "@codemirror/state": "^6.4.1",
-        "@codemirror/view": "^6.35.0",
+        "@codemirror/state": "^6.5.0",
+        "@codemirror/view": "^6.35.3",
         "@juggle/resize-observer": "^3.3.1",
         "@lezer/common": "^1.2.3",
         "@lezer/generator": "^1.7.1",
@@ -46478,9 +46491,9 @@
       }
     },
     "@codemirror/commands": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.2.tgz",
-      "integrity": "sha512-Fq7eWOl1Rcbrfn6jD8FPCj9Auaxdm5nIK5RYOeW7ughnd/rY5AmPg6b+CfsG39ZHdwiwe8lde3q8uR7CF5S0yQ==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.7.1.tgz",
+      "integrity": "sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==",
       "dev": true,
       "requires": {
         "@codemirror/language": "^6.0.0",
@@ -46547,9 +46560,9 @@
       }
     },
     "@codemirror/language": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
-      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
+      "version": "6.10.6",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.6.tgz",
+      "integrity": "sha512-KrsbdCnxEztLVbB5PycWXFxas4EOyk/fPAfruSOnDDppevQgid2XZ+KbJ9u+fDikP/e7MW7HPBTvTb8JlZK9vA==",
       "dev": true,
       "requires": {
         "@codemirror/state": "^6.0.0",
@@ -46583,18 +46596,21 @@
       }
     },
     "@codemirror/state": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz",
-      "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==",
-      "dev": true
-    },
-    "@codemirror/view": {
-      "version": "6.35.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.0.tgz",
-      "integrity": "sha512-I0tYy63q5XkaWsJ8QRv5h6ves7kvtrBWjBcnf/bzohFJQc5c14a1AQRdE8QpPF9eMp5Mq2FMm59TCj1gDfE7kw==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.0.tgz",
+      "integrity": "sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==",
       "dev": true,
       "requires": {
-        "@codemirror/state": "^6.4.0",
+        "@marijn/find-cluster-break": "^1.0.0"
+      }
+    },
+    "@codemirror/view": {
+      "version": "6.35.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.35.3.tgz",
+      "integrity": "sha512-ScY7L8+EGdPl4QtoBiOzE4FELp7JmNUsBvgBcCakXWM2uiv/K89VAzU3BMDscf0DsACLvTKePbd5+cFDTcei6g==",
+      "dev": true,
+      "requires": {
+        "@codemirror/state": "^6.5.0",
         "style-mod": "^4.1.0",
         "w3c-keyname": "^2.2.4"
       }
@@ -48678,6 +48694,12 @@
         }
       }
     },
+    "@marijn/find-cluster-break": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
+      "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
+      "dev": true
+    },
     "@maxmind/geoip2-node": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@maxmind/geoip2-node/-/geoip2-node-5.0.0.tgz",
@@ -51147,13 +51169,13 @@
         "@babel/preset-typescript": "^7.24.7",
         "@babel/register": "^7.24.6",
         "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#v6.18.2-overleaf-1",
-        "@codemirror/commands": "^6.6.2",
+        "@codemirror/commands": "^6.7.1",
         "@codemirror/lang-markdown": "^6.2.5",
-        "@codemirror/language": "^6.10.3",
+        "@codemirror/language": "^6.10.6",
         "@codemirror/lint": "^6.8.4",
         "@codemirror/search": "github:overleaf/codemirror-search#94f33f7fa6db95dadd3d7aed05c30cdde550835a",
-        "@codemirror/state": "^6.4.1",
-        "@codemirror/view": "^6.35.0",
+        "@codemirror/state": "^6.5.0",
+        "@codemirror/view": "^6.35.3",
         "@contentful/rich-text-html-renderer": "^16.0.2",
         "@contentful/rich-text-types": "^16.0.2",
         "@google-cloud/bigquery": "^6.0.1",
diff --git a/services/web/frontend/js/features/source-editor/components/command-tooltip/ref-tooltip.tsx b/services/web/frontend/js/features/source-editor/components/command-tooltip/ref-tooltip.tsx
index feab52ce87..79fa774af1 100644
--- a/services/web/frontend/js/features/source-editor/components/command-tooltip/ref-tooltip.tsx
+++ b/services/web/frontend/js/features/source-editor/components/command-tooltip/ref-tooltip.tsx
@@ -42,6 +42,7 @@ export const RefTooltipContent: FC = () => {
             // TODO: handle label not found
             if (labelNode) {
               view.dispatch(selectNode(labelNode))
+              view.focus()
             }
           }
         }}
diff --git a/services/web/package.json b/services/web/package.json
index f4881dd751..7dbdb04700 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -180,13 +180,13 @@
     "@babel/preset-typescript": "^7.24.7",
     "@babel/register": "^7.24.6",
     "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#v6.18.2-overleaf-1",
-    "@codemirror/commands": "^6.6.2",
+    "@codemirror/commands": "^6.7.1",
     "@codemirror/lang-markdown": "^6.2.5",
-    "@codemirror/language": "^6.10.3",
+    "@codemirror/language": "^6.10.6",
     "@codemirror/lint": "^6.8.4",
     "@codemirror/search": "github:overleaf/codemirror-search#94f33f7fa6db95dadd3d7aed05c30cdde550835a",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.35.0",
+    "@codemirror/state": "^6.5.0",
+    "@codemirror/view": "^6.35.3",
     "@juggle/resize-observer": "^3.3.1",
     "@lezer/common": "^1.2.3",
     "@lezer/generator": "^1.7.1",