diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 5462bcd4de961..b0db7be28fb50 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -197,14 +197,13 @@ export default Vue.extend({
     handleKeyDown: function (event) {
       if (this.visibleDataList.length === 0) { return }
       if (event.key === 'Enter') {
-        this.inputData = this.visibleDataList[this.searchState.selectedOption]
         // Update Input box value if enter key was pressed and option selected
         if (this.searchState.selectedOption !== -1) {
           this.searchState.showOptions = false
           event.preventDefault()
           this.inputData = this.visibleDataList[this.searchState.selectedOption]
-          this.handleClick()
         }
+        this.handleClick()
       } else {
         this.searchState.showOptions = true
         const isArrow = event.key === 'ArrowDown' || event.key === 'ArrowUp'