diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js b/src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js
index 08738bebf..8f0163177 100644
--- a/src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js
+++ b/src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js
@@ -101,11 +101,24 @@ const SearchBar = ({ className, query, active }) => {
                     </Button>
             }
             {
-                searchHistory.items.length > 0 && historyActive && active ?
+                historyActive && active ?
                     <div className={styles['search-history']} onBlur={handleBlur} ref={searchHistoryRef}>
+                        {
+                            localSearch.searchResults.length === 0 && searchHistory.items.length === 0 ?
+                                <div className={styles['search-history-label']}>{t('Start typing ...')}</div>
+                                :
+                                null
+                        }
                         <div className={styles['search-history-actions']}>
-                            <div className={styles['search-history-label']}>{t('STREMIO_TV_SEARCH_HISTORY_TITLE')}</div>
-                            <button className={styles['search-history-clear']} onClick={() => searchHistory.clear()}>{t('CLEAR_HISTORY')}</button>
+                            {
+                                searchHistory.items.length > 0 ?
+                                    <React.Fragment>
+                                        <div className={styles['search-history-label']}>{t('STREMIO_TV_SEARCH_HISTORY_TITLE')}</div>
+                                        <button className={styles['search-history-clear']} onClick={() => searchHistory.clear()}>{t('CLEAR_HISTORY')}</button>
+                                    </React.Fragment>
+                                    :
+                                    null
+                            }
                         </div>
                         <div className={styles['search-history-items']}>
                             {searchHistory.items.slice(0, 8).map((item, index) => {
@@ -113,6 +126,17 @@ const SearchBar = ({ className, query, active }) => {
                                     <button key={index} className={styles['search-history-item']} onClick={queryInputOnSubmit}>{item}</button>
                                 );
                             })}
+                            {
+                                localSearch.searchResults.length > 0 ?
+                                    <div className={styles['search-history-label']}>{t('Recommendations')}</div>
+                                    :
+                                    null
+                            }
+                            {localSearch.searchResults.map((item, index) => {
+                                return (
+                                    <button key={index} className={styles['search-history-item']} onClick={queryInputOnSubmit}>{item.name}</button>
+                                );
+                            })}
                         </div>
                     </div>
                     :
diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/styles.less b/src/common/NavBar/HorizontalNavBar/SearchBar/styles.less
index aa69f3490..64ca9e662 100644
--- a/src/common/NavBar/HorizontalNavBar/SearchBar/styles.less
+++ b/src/common/NavBar/HorizontalNavBar/SearchBar/styles.less
@@ -60,22 +60,27 @@
         background-color: var(--modal-background-color);
         border-radius: var(--border-radius);
         
+        .search-history-label {
+            font-size: 0.9rem;
+            color: var(--primary-foreground-color);
+        }
+
         .search-history-actions {
             display: flex;
             justify-content: space-between;
             width: 100%;
             opacity: 0.8;
-            margin-bottom: 1rem;
+            padding-bottom: 1rem;
 
             .search-history-label {
-                font-size: 0.8rem;
+                font-size: 0.9rem;
                 color: var(--primary-foreground-color);
             }
 
             .search-history-clear {
                 cursor: pointer;
                 color: var(--primary-foreground-color);
-                font-size: 0.8rem;
+                font-size: 0.9rem;
 
                 &:hover {
                     opacity: 0.6;
@@ -84,14 +89,21 @@
         }
 
         .search-history-items {
-            width: 90%;
+            width: 100;
             margin: 0 auto;
             display: flex;
             justify-content: center;
             align-items: flex-start;
             flex-direction: column;
 
+            .search-history-label {
+                font-size: 0.9rem;
+                color: var(--primary-foreground-color);
+                margin: 1rem 0;
+            }
+
             .search-history-item {
+                width: 90%;
                 color: var(--primary-foreground-color);
                 text-align: left;
                 text-decoration: none;
diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.js b/src/common/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.js
index b85577531..c43959735 100644
--- a/src/common/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.js
+++ b/src/common/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.js
@@ -7,9 +7,16 @@ const useModelState = require('../../../../common/useModelState');
 const useLocalSearch = (query) => {
     const { core } = useServices();
 
-    const { searchResults } = useModelState({ model: 'local_search' });
+    const action = React.useMemo(() => ({
+        action: 'Load',
+        args: {
+            model: 'LocalSearch',
+        }
+    }), []);
 
-    const dispatchSearch = React.useCallback(() => {
+    const { searchResults } = useModelState({ model: 'local_search', action });
+
+    const dispatchSearch = React.useEffect(() => {
         core.transport.dispatch({
             action: 'Search',
             args: {
@@ -17,7 +24,7 @@ const useLocalSearch = (query) => {
                 args: {
                     searchQuery: query,
                     maxResults: 5
-                },
+                }
             },
         });
     }, [query]);