diff --git a/frontend/app/block/blockframe.tsx b/frontend/app/block/blockframe.tsx
index 09b4d7a2..fcfb65a8 100644
--- a/frontend/app/block/blockframe.tsx
+++ b/frontend/app/block/blockframe.tsx
@@ -680,6 +680,9 @@ const ChangeConnectionBlockModal = React.memo(
             },
             [changeConnModalAtom, viewModel, blockId, connSelected, selectionList]
         );
+        React.useEffect(() => {
+            setRowIndex((idx) => Math.min(idx, filteredList.length));
+        }, [selectionList, setRowIndex]);
         // this check was also moved to BlockFrame to prevent all the above code from running unnecessarily
         if (!changeConnModalOpen) {
             return null;