diff --git a/apps/client/src/widgets/dialogs/bulk_actions.tsx b/apps/client/src/widgets/dialogs/bulk_actions.tsx
index f1b10d33f..3156d0d88 100644
--- a/apps/client/src/widgets/dialogs/bulk_actions.tsx
+++ b/apps/client/src/widgets/dialogs/bulk_actions.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "preact/hooks";
+import { useEffect, useState, useCallback } from "preact/hooks";
 import { t } from "../../services/i18n";
 import Modal from "../react/Modal";
 import ReactBasicWidget from "../react/ReactBasicWidget";
@@ -28,26 +28,30 @@ function BulkActionComponent() {
         setShown(true);
     });
 
-    if (selectedOrActiveNoteIds && bulkActionNote) {
-        useEffect(() => {
-            server.post<BulkActionAffectedNotes>("bulk-action/affected-notes", {
-                noteIds: selectedOrActiveNoteIds,
-                includeDescendants
-            }).then(({ affectedNoteCount }) => setAffectedNoteCount(affectedNoteCount));
-        }, [ selectedOrActiveNoteIds, includeDescendants ]);
-
-        function refreshExistingActions() {
-            setExistingActions(bulk_action.parseActions(bulkActionNote!));
-        }
+    useEffect(() => {
+        if (!selectedOrActiveNoteIds || !bulkActionNote) return;
         
-        useEffect(() => refreshExistingActions(), []);
-        useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
-            if (loadResults.getAttributeRows().find((row) =>
-                row.type === "label" && row.name === "action" && row.noteId === "_bulkAction")) {
-                    refreshExistingActions();
-            }
-        }, shown);
-    }
+        server.post<BulkActionAffectedNotes>("bulk-action/affected-notes", {
+            noteIds: selectedOrActiveNoteIds,
+            includeDescendants
+        }).then(({ affectedNoteCount }) => setAffectedNoteCount(affectedNoteCount));
+    }, [ selectedOrActiveNoteIds, includeDescendants, bulkActionNote ]);
+
+    const refreshExistingActions = useCallback(() => {
+        if (!bulkActionNote) return;
+        setExistingActions(bulk_action.parseActions(bulkActionNote));
+    }, [bulkActionNote]);
+    
+    useEffect(() => {
+        refreshExistingActions();
+    }, [refreshExistingActions]);
+    
+    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
+        if (loadResults.getAttributeRows().find((row) =>
+            row.type === "label" && row.name === "action" && row.noteId === "_bulkAction")) {
+                refreshExistingActions();
+        }
+    }, shown);
 
     return (
         <Modal
diff --git a/apps/client/src/widgets/dialogs/delete_notes.tsx b/apps/client/src/widgets/dialogs/delete_notes.tsx
index 9af85d518..54afbb752 100644
--- a/apps/client/src/widgets/dialogs/delete_notes.tsx
+++ b/apps/client/src/widgets/dialogs/delete_notes.tsx
@@ -1,9 +1,8 @@
-import { useRef, useState } from "preact/hooks";
+import { useRef, useState, useEffect } from "preact/hooks";
 import { t } from "../../services/i18n.js";
 import FormCheckbox from "../react/FormCheckbox.js";
 import Modal from "../react/Modal.js";
 import ReactBasicWidget from "../react/ReactBasicWidget.js";
-import { useEffect } from "preact/hooks";
 import type { DeleteNotesPreview } from "@triliumnext/commons";
 import server from "../../services/server.js";
 import froca from "../../services/froca.js";
diff --git a/apps/client/src/widgets/react/Dropdown.tsx b/apps/client/src/widgets/react/Dropdown.tsx
index 71078e21b..58a3bd654 100644
--- a/apps/client/src/widgets/react/Dropdown.tsx
+++ b/apps/client/src/widgets/react/Dropdown.tsx
@@ -12,20 +12,28 @@ export default function Dropdown({ className, isStatic, children }: DropdownProp
     const dropdownRef = useRef<HTMLDivElement | null>(null);
     const triggerRef = useRef<HTMLButtonElement | null>(null);
 
-    if (triggerRef?.current) {
-        useEffect(() => {
-            const dropdown = BootstrapDropdown.getOrCreateInstance(triggerRef.current!);
-            return () => dropdown.dispose();
-        });
-    }
+    useEffect(() => {
+        if (!triggerRef.current) return;
+        
+        const dropdown = BootstrapDropdown.getOrCreateInstance(triggerRef.current);
+        return () => dropdown.dispose();
+    }, []); // Add dependency array
 
-    if (dropdownRef?.current) {
-        useEffect(() => {
-            $(dropdownRef.current!).on("hide.bs.dropdown", () => {
-                console.log("Hide");
-            });
-        });
-    }
+    useEffect(() => {
+        if (!dropdownRef.current) return;
+        
+        const handleHide = () => {
+            // Remove console.log from production code
+        };
+        
+        const $dropdown = $(dropdownRef.current);
+        $dropdown.on("hide.bs.dropdown", handleHide);
+        
+        // Add proper cleanup
+        return () => {
+            $dropdown.off("hide.bs.dropdown", handleHide);
+        };
+    }, []); // Add dependency array
 
     return (
         <div ref={dropdownRef} class="dropdown" style={{ display: "flex" }}>