diff --git a/src/common/NavBar/SearchBar/SearchBar.js b/src/common/NavBar/SearchBar/SearchBar.js
index 2b25caaf5..7201483a9 100644
--- a/src/common/NavBar/SearchBar/SearchBar.js
+++ b/src/common/NavBar/SearchBar/SearchBar.js
@@ -44,14 +44,10 @@ const SearchBar = ({ className }) => {
                         key={query}
                         ref={searchInputRef}
                         className={styles['search-input']}
-                        defaultValue={query}
-                        tabIndex={-1}
-                        size={1}
                         type={'text'}
                         placeholder={'Search'}
-                        autoCorrect={'off'}
-                        autoCapitalize={'off'}
-                        spellCheck={false}
+                        defaultValue={query}
+                        tabIndex={-1}
                         onSubmit={queryInputOnSubmit}
                     />
                     :
diff --git a/src/common/TextInput/TextInput.js b/src/common/TextInput/TextInput.js
index f64e48cb6..3cf5f5e7b 100644
--- a/src/common/TextInput/TextInput.js
+++ b/src/common/TextInput/TextInput.js
@@ -16,6 +16,11 @@ const TextInput = React.forwardRef((props, ref) => {
     }, [props.onKeyUp, props.onSubmit]);
     return (
         <input
+            size={1}
+            autoCorrect={'off'}
+            autoCapitalize={'off'}
+            autoComplete={'off'}
+            spellCheck={false}
             tabIndex={focusable && !props.disabled ? 0 : -1}
             {...props}
             ref={ref}