diff --git a/apps/client/src/widgets/buttons/right_pane_toggle.tsx b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
index 7d91b6b2d..8f82e9de0 100644
--- a/apps/client/src/widgets/buttons/right_pane_toggle.tsx
+++ b/apps/client/src/widgets/buttons/right_pane_toggle.tsx
@@ -10,7 +10,7 @@ export default function RightPaneToggle() {
     const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
 
     useTriliumEvent("toggleRightPane", () => {
-        setRightPaneVisible(!rightPaneVisible);
+        setRightPaneVisible(current => !current);
     });
 
     return (
diff --git a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
index 4a16da5cc..a6df7ba9d 100644
--- a/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
+++ b/apps/client/src/widgets/sidebar/RightPanelContainer.tsx
@@ -31,8 +31,11 @@ export default function RightPanelContainer({ widgetsByParent }: { widgetsByPare
     const items = useItems(rightPaneVisible, widgetsByParent);
     useSplit(rightPaneVisible);
     useTriliumEvent("toggleRightPane", () => {
-        options.save("rightPaneVisible",(!rightPaneVisible).toString());
-        setRightPaneVisible(!rightPaneVisible);
+        setRightPaneVisible(current => {
+            const newValue = !current;
+            options.save("rightPaneVisible", newValue.toString());
+            return newValue;
+        });
     });
 
     return (