diff --git a/frontend/src/Editor/Components/Kanban/KanbanBoard.jsx b/frontend/src/Editor/Components/Kanban/KanbanBoard.jsx
index ccc4954153..2569fd36c6 100644
--- a/frontend/src/Editor/Components/Kanban/KanbanBoard.jsx
+++ b/frontend/src/Editor/Components/Kanban/KanbanBoard.jsx
@@ -95,6 +95,7 @@ export function KanbanBoard({ widgetHeight, kanbanProps, parentRef }) {
       if (lastSelectedCard?.id === cardId) {
         setExposedVariables({
           lastSelectedCard: cardDataAsObj[cardId],
+
           lastUpdatedCard: cardDataAsObj[cardId],
           lastCardUpdate: diffKeys.map((key) => {
             return {
diff --git a/frontend/src/Editor/Inspector/EventManager.jsx b/frontend/src/Editor/Inspector/EventManager.jsx
index 99a35ead29..05d8d398d5 100644
--- a/frontend/src/Editor/Inspector/EventManager.jsx
+++ b/frontend/src/Editor/Inspector/EventManager.jsx
@@ -219,11 +219,20 @@ export const EventManager = ({
     return appsOptionsList;
   }
 
-  function getPageOptions() {
-    return pages.map((page) => ({
-      name: page.name,
-      value: page.id,
-    }));
+  function getPageOptions(event) {
+    // If disabled page is already selected then don't remove from page options
+    if (pages.find((page) => page.id === event.pageId)?.disabled) {
+      return pages.map((page) => ({
+        name: page.name,
+        value: page.id,
+      }));
+    }
+    return pages
+      .filter((page) => !page.disabled)
+      .map((page) => ({
+        name: page.name,
+        value: page.id,
+      }));
   }
 
   function handleQueryChange(index, updates) {
@@ -751,7 +760,7 @@ export const EventManager = ({
                 event={event}
                 handlerChanged={handlerChanged}
                 eventIndex={index}
-                getPages={getPageOptions}
+                getPages={() => getPageOptions(event)}
                 darkMode={darkMode}
               />
             )}