diff --git a/src/components/app/Modal.js b/src/components/app/Modal.js
index a2e9309e3..ac5297954 100644
--- a/src/components/app/Modal.js
+++ b/src/components/app/Modal.js
@@ -168,6 +168,12 @@ class Modal extends Component {
         });
     }
 
+    setFetchOnTrue = () => {
+        this.setState({
+            waitingFetch: true
+        });
+    }
+
     handleStart = () => {
         const {dispatch, layout, windowType, indicator} = this.props;
 
@@ -321,11 +327,11 @@ class Modal extends Component {
 
         return(
             <OverlayField
-                handleStart={this.handleStart}
                 type={windowType}
                 disabled={pending}
                 data={data}
                 layout={layout}
+                setFetchOnTrue={this.setFetchOnTrue}
             />
         )
     }
diff --git a/src/components/app/OverlayField.js b/src/components/app/OverlayField.js
index 675caa43f..85af29c13 100644
--- a/src/components/app/OverlayField.js
+++ b/src/components/app/OverlayField.js
@@ -8,13 +8,11 @@ import {
 class OverlayField extends Component {
 
     handleKeyDown = (e) => {
-        const {handleStart} = this.props;
+        const {setFetchOnTrue} = this.props;
         switch(e.key) {
             case 'Enter':
             document.activeElement.blur();
-            setTimeout(() => {
-                handleStart();
-            }, 1000);
+            setFetchOnTrue();
             break;
         }
     }
diff --git a/src/components/header/Header.js b/src/components/header/Header.js
index 625d5f4b5..accd0961c 100644
--- a/src/components/header/Header.js
+++ b/src/components/header/Header.js
@@ -502,7 +502,7 @@ class Header extends Component {
                 />}
 
                 <GlobalContextShortcuts
-                    handleSidelistToggle={(id) => 
+                    handleSidelistToggle={(id) =>
                         this.handleSidelistToggle(id, sideListTab)}
                     handleMenuOverlay={isMenuOverlayShow ?
                         () => this.handleMenuOverlay('', '') :