diff --git a/frontend/src/Indexer/Editor/Tags/TagsModalContent.js b/frontend/src/Indexer/Editor/Tags/TagsModalContent.js
index 13bb255be..0ea26e968 100644
--- a/frontend/src/Indexer/Editor/Tags/TagsModalContent.js
+++ b/frontend/src/Indexer/Editor/Tags/TagsModalContent.js
@@ -50,7 +50,7 @@ class TagsModalContent extends Component {
 
   render() {
     const {
-      movieTags,
+      indexerTags,
       tagList,
       onModalClose
     } = this.props;
@@ -108,7 +108,7 @@ class TagsModalContent extends Component {
 
               <div className={styles.result}>
                 {
-                  movieTags.map((t) => {
+                  indexerTags.map((t) => {
                     const tag = _.find(tagList, { id: t });
 
                     if (!tag) {
@@ -140,7 +140,7 @@ class TagsModalContent extends Component {
                           return null;
                         }
 
-                        if (movieTags.indexOf(t) > -1) {
+                        if (indexerTags.indexOf(t) > -1) {
                           return null;
                         }
 
@@ -179,7 +179,7 @@ class TagsModalContent extends Component {
 }
 
 TagsModalContent.propTypes = {
-  movieTags: PropTypes.arrayOf(PropTypes.number).isRequired,
+  indexerTags: PropTypes.arrayOf(PropTypes.number).isRequired,
   tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
   onModalClose: PropTypes.func.isRequired,
   onApplyTagsPress: PropTypes.func.isRequired
diff --git a/frontend/src/Indexer/Editor/Tags/TagsModalContentConnector.js b/frontend/src/Indexer/Editor/Tags/TagsModalContentConnector.js
index 8b7d74f50..deb288868 100644
--- a/frontend/src/Indexer/Editor/Tags/TagsModalContentConnector.js
+++ b/frontend/src/Indexer/Editor/Tags/TagsModalContentConnector.js
@@ -10,15 +10,15 @@ function createMapStateToProps() {
     (state, { indexerIds }) => indexerIds,
     createAllIndexersSelector(),
     createTagsSelector(),
-    (indexerIds, allMovies, tagList) => {
-      const movies = _.intersectionWith(allMovies, indexerIds, (s, id) => {
+    (indexerIds, allIndexers, tagList) => {
+      const indexers = _.intersectionWith(allIndexers, indexerIds, (s, id) => {
         return s.id === id;
       });
 
-      const movieTags = _.uniq(_.concat(..._.map(movies, 'tags')));
+      const indexerTags = _.uniq(_.concat(..._.map(indexers, 'tags')));
 
       return {
-        movieTags,
+        indexerTags,
         tagList
       };
     }
diff --git a/frontend/src/Indexer/Index/IndexerIndexConnector.js b/frontend/src/Indexer/Index/IndexerIndexConnector.js
index fd876a8e5..ef3f0f091 100644
--- a/frontend/src/Indexer/Index/IndexerIndexConnector.js
+++ b/frontend/src/Indexer/Index/IndexerIndexConnector.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import withScrollPosition from 'Components/withScrollPosition';
 import { testAllIndexers } from 'Store/Actions/indexerActions';
-import { saveMovieEditor, setMovieFilter, setMovieSort, setMovieTableOption } from 'Store/Actions/indexerIndexActions';
+import { saveIndexerEditor, setMovieFilter, setMovieSort, setMovieTableOption } from 'Store/Actions/indexerIndexActions';
 import scrollPositions from 'Store/scrollPositions';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
 import createIndexerClientSideCollectionItemsSelector from 'Store/Selectors/createIndexerClientSideCollectionItemsSelector';
@@ -40,8 +40,8 @@ function createMapDispatchToProps(dispatch, props) {
       dispatch(setMovieFilter({ selectedFilterKey }));
     },
 
-    dispatchSaveMovieEditor(payload) {
-      dispatch(saveMovieEditor(payload));
+    dispatchSaveIndexerEditor(payload) {
+      dispatch(saveIndexerEditor(payload));
     },
 
     onTestAllPress() {
@@ -56,7 +56,7 @@ class IndexerIndexConnector extends Component {
   // Listeners
 
   onSaveSelected = (payload) => {
-    this.props.dispatchSaveMovieEditor(payload);
+    this.props.dispatchSaveIndexerEditor(payload);
   }
 
   onScroll = ({ scrollTop }) => {
@@ -79,7 +79,7 @@ class IndexerIndexConnector extends Component {
 
 IndexerIndexConnector.propTypes = {
   isSmallScreen: PropTypes.bool.isRequired,
-  dispatchSaveMovieEditor: PropTypes.func.isRequired,
+  dispatchSaveIndexerEditor: PropTypes.func.isRequired,
   items: PropTypes.arrayOf(PropTypes.object)
 };
 
diff --git a/frontend/src/Search/SearchFooter.js b/frontend/src/Search/SearchFooter.js
index 0fcdf1f27..90ce537cc 100644
--- a/frontend/src/Search/SearchFooter.js
+++ b/frontend/src/Search/SearchFooter.js
@@ -4,6 +4,7 @@ import React, { Component } from 'react';
 import IndexersSelectInputConnector from 'Components/Form/IndexersSelectInputConnector';
 import NewznabCategorySelectInputConnector from 'Components/Form/NewznabCategorySelectInputConnector';
 import TextInput from 'Components/Form/TextInput';
+import keyboardShortcuts from 'Components/keyboardShortcuts';
 import SpinnerButton from 'Components/Link/SpinnerButton';
 import PageContentFooter from 'Components/Page/PageContentFooter';
 import SearchFooterLabel from './SearchFooterLabel';
@@ -41,6 +42,8 @@ class SearchFooter extends Component {
     if (searchQuery !== '' || searchCategories !== [] || searchIndexerIds !== []) {
       this.onSearchPress();
     }
+
+    this.props.bindShortcut('enter', this.onSearchPress, { isGlobal: true });
   }
 
   componentDidUpdate(prevProps) {
@@ -114,6 +117,7 @@ class SearchFooter extends Component {
 
           <TextInput
             name='searchQuery'
+            autoFocus={true}
             value={searchQuery}
             isDisabled={isFetching}
             onChange={onInputChange}
@@ -181,7 +185,8 @@ SearchFooter.propTypes = {
   onSearchPress: PropTypes.func.isRequired,
   hasIndexers: PropTypes.bool.isRequired,
   onInputChange: PropTypes.func.isRequired,
-  searchError: PropTypes.object
+  searchError: PropTypes.object,
+  bindShortcut: PropTypes.func.isRequired
 };
 
-export default SearchFooter;
+export default keyboardShortcuts(SearchFooter);
diff --git a/frontend/src/Store/Actions/indexerIndexActions.js b/frontend/src/Store/Actions/indexerIndexActions.js
index af2e8af68..f0da8b23b 100644
--- a/frontend/src/Store/Actions/indexerIndexActions.js
+++ b/frontend/src/Store/Actions/indexerIndexActions.js
@@ -176,7 +176,7 @@ export const SET_MOVIE_SORT = 'indexerIndex/setMovieSort';
 export const SET_MOVIE_FILTER = 'indexerIndex/setMovieFilter';
 export const SET_MOVIE_VIEW = 'indexerIndex/setMovieView';
 export const SET_MOVIE_TABLE_OPTION = 'indexerIndex/setMovieTableOption';
-export const SAVE_MOVIE_EDITOR = 'indexerIndex/saveMovieEditor';
+export const SAVE_INDEXER_EDITOR = 'indexerIndex/saveIndexerEditor';
 export const BULK_DELETE_INDEXERS = 'indexerIndex/bulkDeleteIndexers';
 
 //
@@ -186,14 +186,14 @@ export const setMovieSort = createAction(SET_MOVIE_SORT);
 export const setMovieFilter = createAction(SET_MOVIE_FILTER);
 export const setMovieView = createAction(SET_MOVIE_VIEW);
 export const setMovieTableOption = createAction(SET_MOVIE_TABLE_OPTION);
-export const saveMovieEditor = createThunk(SAVE_MOVIE_EDITOR);
+export const saveIndexerEditor = createThunk(SAVE_INDEXER_EDITOR);
 export const bulkDeleteIndexers = createThunk(BULK_DELETE_INDEXERS);
 
 //
 // Action Handlers
 
 export const actionHandlers = handleThunks({
-  [SAVE_MOVIE_EDITOR]: function(getState, payload, dispatch) {
+  [SAVE_INDEXER_EDITOR]: function(getState, payload, dispatch) {
     dispatch(set({
       section,
       isSaving: true