diff --git a/ElectronClient/app/gui/NoteText.jsx b/ElectronClient/app/gui/NoteText.jsx
index c413ddaaeb..45e6e2841c 100644
--- a/ElectronClient/app/gui/NoteText.jsx
+++ b/ElectronClient/app/gui/NoteText.jsx
@@ -342,9 +342,8 @@ class NoteTextComponent extends React.Component {
 			this.editorSetScrollTop(1);
 			this.restoreScrollTop_ = 0;
 
-			// If a search is in progress we don't focus any field otherwise it will
-			// take the focus out of the search box.
-			if (note && this.props.notesParentType !== 'Search') {
+			// Only force focus on notes when creating a new note/todo
+			if (this.props.newNote) {
 				const focusSettingName = !!note.is_todo ? 'newTodoFocus' : 'newNoteFocus';
 
 				if (Setting.value(focusSettingName) === 'title') {