diff --git a/server/src/workflow-management/utils.ts b/server/src/workflow-management/utils.ts
index 2523ff1b..4cf1232f 100644
--- a/server/src/workflow-management/utils.ts
+++ b/server/src/workflow-management/utils.ts
@@ -62,5 +62,31 @@ export const getBestSelectorForAction = (action: Action) => {
           null
         );
       }
-    
+      return (
+        selectors.testIdSelector ??
+        selectors?.id ??
+        selectors?.accessibilitySelector ??
+        selectors?.hrefSelector ??
+        selectors?.generalSelector ??
+        selectors?.attrSelector ??
+        null
+      );
+    }
+    case ActionType.Input:
+    case ActionType.Keydown: {
+      const selectors = action.selectors;
+      return (
+        selectors.testIdSelector ??
+        selectors?.id ??
+        selectors?.formSelector ??
+        selectors?.accessibilitySelector ??
+        selectors?.generalSelector ??
+        selectors?.attrSelector ??
+        null
+      );
+    }
+    default:
+      break;
+  }
+  return null;
 }