diff --git a/apps/client/src/widgets/react/FormList.tsx b/apps/client/src/widgets/react/FormList.tsx
index 9562d4a9b..c12c8a317 100644
--- a/apps/client/src/widgets/react/FormList.tsx
+++ b/apps/client/src/widgets/react/FormList.tsx
@@ -54,7 +54,8 @@ export default function FormList({ children, onSelect, style, fullHeight }: Form
                     ...builtinStyles,
                     position: "relative",
                 }} onClick={(e) => {
-                    const value = (e.target as HTMLElement).closest("a.dropdown-item")?.dataset?.value;
+                    const dropdownItem = (e.target as HTMLElement).closest(".dropdown-item") as HTMLElement | null;
+                    const value = dropdownItem?.dataset?.value;
                     if (value && onSelect) {
                         onSelect(value);
                     }
diff --git a/apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx b/apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx
index 65cb9a050..4681151fd 100644
--- a/apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx
+++ b/apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx
@@ -34,7 +34,7 @@ export default function SearchDefinitionTab({ note, ntxId }: TabContext) {
 
     for (const searchOption of SEARCH_OPTIONS) {
       const attr = note.getAttribute(searchOption.attributeType, searchOption.attributeName);      
-      if (attr && searchOption.component) {
+      if (attr) {
         activeOptions.push(searchOption);
       } else {
         availableOptions.push(searchOption);