diff --git a/packages/web/src/modals/InsertJoinModal.js b/packages/web/src/modals/InsertJoinModal.js
index 5c83d031d..845eb8683 100644
--- a/packages/web/src/modals/InsertJoinModal.js
+++ b/packages/web/src/modals/InsertJoinModal.js
@@ -103,17 +103,20 @@ export default function InsertJoinModal({ sql, modalState, engine, dbinfo, onIns
     if (event.keyCode == keycodes.leftArrow) {
       targetRef.current.focus();
     }
-    if (event.keyCode == keycodes.enter || event.keyCode == keycodes.rightArrow) {
+    if (event.keyCode == keycodes.enter) {
       aliasRef.current.focus();
     }
   }, []);
-  const aliasKeyDown = React.useCallback((event) => {
-    if (event.keyCode == keycodes.enter) {
-      event.preventDefault();
-      modalState.close();
-      onInsert(sqlPreview);
-    }
-  }, []);
+  const aliasKeyDown = React.useCallback(
+    (event) => {
+      if (event.keyCode == keycodes.enter) {
+        event.preventDefault();
+        modalState.close();
+        onInsert(sqlPreview);
+      }
+    },
+    [onInsert, sqlPreview]
+  );
 
   return (
     <ModalBase modalState={modalState}>
diff --git a/packages/web/src/sqleditor/analyseQuerySources.js b/packages/web/src/sqleditor/analyseQuerySources.js
index bf19db833..ff85b726b 100644
--- a/packages/web/src/sqleditor/analyseQuerySources.js
+++ b/packages/web/src/sqleditor/analyseQuerySources.js
@@ -18,14 +18,15 @@ export default function analyseQuerySources(sql, sourceNames) {
             res.push({
               name: word,
             });
-          }
-          if (/^(where)|(inner)|(left)|(right)|(on)$/i.test(postWord)) {
-            continue;
-          }
-          res.push({
-            name: word,
-            alias: postWord,
-          });
+          } else if (/^(where)|(inner)|(left)|(right)|(on)$/i.test(postWord)) {
+            res.push({
+              name: word,
+            });
+          } else
+            res.push({
+              name: word,
+              alias: postWord,
+            });
         }
       }
     }