diff --git a/package-lock.json b/package-lock.json
index 119905f..66efa09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,8 +18,8 @@
         "@types/markdown-it": "^14.1.2",
         "@types/node": "^22.10.2",
         "@types/parsimmon": "^1.10.6",
-        "@types/react": "^18.0.0",
-        "@types/react-dom": "^18.0.0",
+        "@types/react": "^19.0.1",
+        "@types/react-dom": "^19.0.2",
         "@typescript-eslint/eslint-plugin": "^8.18.0",
         "@typescript-eslint/parser": "^8.18.0",
         "autoprefixer": "^10.2.5",
@@ -53,8 +53,8 @@
         "prosemirror-state": "^1.4.3",
         "prosemirror-transform": "^1.10.2",
         "prosemirror-view": "^1.37.1",
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0",
+        "react": "^19.0.0",
+        "react-dom": "^19.0.0",
         "sqlite": "^5.1.1",
         "sqlite3": "^5.1.6",
         "style-loader": "^4.0.0",
@@ -3741,13 +3741,6 @@
         "xmlbuilder": ">=11.0.1"
       }
     },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.14",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
-      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/qs": {
       "version": "6.9.17",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
@@ -3763,24 +3756,22 @@
       "license": "MIT"
     },
     "node_modules/@types/react": {
-      "version": "18.3.16",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.16.tgz",
-      "integrity": "sha512-oh8AMIC4Y2ciKufU8hnKgs+ufgbA/dhPTACaZPM86AbwX9QwnFtSoPWEeRUj8fge+v6kFt78BXcDhAU1SrrAsw==",
+      "version": "19.0.1",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.1.tgz",
+      "integrity": "sha512-YW6614BDhqbpR5KtUYzTA+zlA7nayzJRA9ljz9CQoxthR0sDisYZLuvSMsil36t4EH/uAt8T52Xb4sVw17G+SQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@types/prop-types": "*",
         "csstype": "^3.0.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.3.5",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
-      "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
+      "version": "19.0.2",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.2.tgz",
+      "integrity": "sha512-c1s+7TKFaDRRxr1TxccIX2u7sfCnc3RxkVyBIUA2lCpyqCF+QoAwQ/CBg7bsMdVwP120HEH143VQezKtef5nCg==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@types/react": "^18.0.0"
+        "@types/react": "^19.0.0"
       }
     },
     "node_modules/@types/responselike": {
@@ -13856,30 +13847,24 @@
       }
     },
     "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",
+      "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "version": "19.0.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz",
+      "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
+        "scheduler": "^0.25.0"
       },
       "peerDependencies": {
-        "react": "^18.3.1"
+        "react": "^19.0.0"
       }
     },
     "node_modules/read-binary-file-arch": {
@@ -14427,14 +14412,10 @@
       "license": "ISC"
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz",
+      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==",
+      "dev": true
     },
     "node_modules/schema-utils": {
       "version": "3.3.0",
diff --git a/package.json b/package.json
index 9f9cd79..fa0331b 100644
--- a/package.json
+++ b/package.json
@@ -78,8 +78,8 @@
     "@types/markdown-it": "^14.1.2",
     "@types/node": "^22.10.2",
     "@types/parsimmon": "^1.10.6",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.2",
     "@typescript-eslint/eslint-plugin": "^8.18.0",
     "@typescript-eslint/parser": "^8.18.0",
     "autoprefixer": "^10.2.5",
@@ -113,8 +113,8 @@
     "prosemirror-state": "^1.4.3",
     "prosemirror-transform": "^1.10.2",
     "prosemirror-view": "^1.37.1",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "sqlite": "^5.1.1",
     "sqlite3": "^5.1.6",
     "style-loader": "^4.0.0",
diff --git a/src/skrift-electron/renderer/components/CardToolbarItem.tsx b/src/skrift-electron/renderer/components/CardToolbarItem.tsx
index 4b7189a..95a9c1b 100644
--- a/src/skrift-electron/renderer/components/CardToolbarItem.tsx
+++ b/src/skrift-electron/renderer/components/CardToolbarItem.tsx
@@ -4,14 +4,16 @@ import React, { PropsWithChildren, useCallback } from "react";
 type Props = {
   onClick?: () => void;
   className?: string;
+  ref?: React.Ref<HTMLDivElement>;
 };
 
-export const CardToolbarItem = React.forwardRef<HTMLDivElement, PropsWithChildren<Props>>(({
+export const CardToolbarItem: React.FC<PropsWithChildren<Props>> = ({
   onClick,
   className,
   children,
+  ref,
   ...props
-}, ref) => {
+}) => {
   return (
     <div
       ref={ref}
@@ -26,4 +28,4 @@ export const CardToolbarItem = React.forwardRef<HTMLDivElement, PropsWithChildre
       {children}
     </div>
   );
-});
+}
diff --git a/src/skrift-electron/renderer/hooks/usePrevious.ts b/src/skrift-electron/renderer/hooks/usePrevious.ts
index cd2f9f4..b3a461f 100644
--- a/src/skrift-electron/renderer/hooks/usePrevious.ts
+++ b/src/skrift-electron/renderer/hooks/usePrevious.ts
@@ -1,7 +1,7 @@
 import { useEffect, useRef } from "react";
 
-export const usePrevious = <T>(value: T): T | undefined => {
-  const ref = useRef<T>();
+export const usePrevious = <T>(value: T): T | null => {
+  const ref = useRef<T>(null);
 
   useEffect(() => {
     ref.current = value;