diff --git a/e2e/screenshots/simulator/recurring/Recurring limit limit/form.png b/e2e/screenshots/simulator/recurring/Recurring limit limit/form.png
index cf4c6f1d3..db3e35ebd 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring limit limit/form.png and b/e2e/screenshots/simulator/recurring/Recurring limit limit/form.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring range range/simulator-results-animation.png b/e2e/screenshots/simulator/recurring/Recurring range range/simulator-results-animation.png
index d29fd8e6a..1659542db 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring range range/simulator-results-animation.png and b/e2e/screenshots/simulator/recurring/Recurring range range/simulator-results-animation.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable sell limit/create/my-strategy.png b/e2e/screenshots/strategy/disposable/Disposable sell limit/create/my-strategy.png
index 9177adb26..274138330 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable sell limit/create/my-strategy.png and b/e2e/screenshots/strategy/disposable/Disposable sell limit/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png
index c80d87547..d4f2a0177 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring limit range/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring limit range/withdraw/form.png
index f2673d4dd..d1c07cd12 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring limit range/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring limit range/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring range limit/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring range limit/create/my-strategy.png
index f827b46f7..4c25acc29 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring range limit/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring range limit/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring range limit/withdraw/form.png b/e2e/screenshots/strategy/recurring/Recurring range limit/withdraw/form.png
index d02f0608e..4c4ddd582 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring range limit/withdraw/form.png and b/e2e/screenshots/strategy/recurring/Recurring range limit/withdraw/form.png differ
diff --git a/src/libs/modals/modals/ModalTradeTokenList/ModalTradeTokenList.tsx b/src/libs/modals/modals/ModalTradeTokenList/ModalTradeTokenList.tsx
index 4d3faad4b..75fbd6d48 100644
--- a/src/libs/modals/modals/ModalTradeTokenList/ModalTradeTokenList.tsx
+++ b/src/libs/modals/modals/ModalTradeTokenList/ModalTradeTokenList.tsx
@@ -43,7 +43,8 @@ export const ModalTradeTokenList: ModalFC<ModalTradeTokenListData> = ({
         setValue={setSearch}
         className="rounded-8"
         onKeyDown={(e) => {
-          if (e.key === 'Enter') handleSelect(tradePairs[0]);
+          if (e.key === 'Enter' && !!tradePairs.length)
+            handleSelect(tradePairs[0]);
         }}
         aria-label="Search Token Pair"
         data-testid="search-token-pair"