diff --git a/apps/client/src/widgets/buttons/right_pane_toggle.tsx b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
index 8f82e9de0..6a31d633c 100644
--- a/apps/client/src/widgets/buttons/right_pane_toggle.tsx
+++ b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
@@ -3,15 +3,15 @@ import clsx from "clsx";
 import { t } from "../../services/i18n";
 import options from "../../services/options";
 import ActionButton from "../react/ActionButton";
-import { useState } from "preact/hooks";
+import { useState, useCallback } from "preact/hooks";
 import { useTriliumEvent } from "../react/hooks";
 
 export default function RightPaneToggle() {
     const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
 
-    useTriliumEvent("toggleRightPane", () => {
+    useTriliumEvent("toggleRightPane", useCallback(() => {
         setRightPaneVisible(current => !current);
-    });
+    }, []));
 
     return (
         <ActionButton
diff --git a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
index a6df7ba9d..56f6dd99c 100644
--- a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
+++ b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
@@ -3,7 +3,7 @@ import "./RightPanelContainer.css";
 
 import Split from "@triliumnext/split.js";
 import { VNode } from "preact";
-import { useState, useEffect, useRef } from "preact/hooks";
+import { useState, useEffect, useRef, useCallback } from "preact/hooks";
 
 import appContext from "../../components/app_context";
 import { WidgetsByParent } from "../../services/bundle";
@@ -11,7 +11,7 @@ import { t } from "../../services/i18n";
 import options from "../../services/options";
 import { DEFAULT_GUTTER_SIZE } from "../../services/resizer";
 import Button from "../react/Button";
-import { useActiveNoteContext, useLegacyWidget, useNoteProperty, useTriliumEvent, useTriliumOptionBool, useTriliumOptionJson } from "../react/hooks";
+import { useActiveNoteContext, useLegacyWidget, useNoteProperty, useTriliumEvent, useTriliumOptionJson } from "../react/hooks";
 import Icon from "../react/Icon";
 import LegacyRightPanelWidget from "../right_panel_widget";
 import HighlightsList from "./HighlightsList";
@@ -30,13 +30,13 @@ export default function RightPanelContainer({ widgetsByParent }: { widgetsByPare
     const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
     const items = useItems(rightPaneVisible, widgetsByParent);
     useSplit(rightPaneVisible);
-    useTriliumEvent("toggleRightPane", () => {
+    useTriliumEvent("toggleRightPane", useCallback(() => {
         setRightPaneVisible(current => {
             const newValue = !current;
             options.save("rightPaneVisible", newValue.toString());
             return newValue;
         });
-    });
+    }, []));
 
     return (
         <div id="right-pane">