diff --git a/files/assets/js/core.js b/files/assets/js/core.js
index 57ff07aa0..47c750251 100644
--- a/files/assets/js/core.js
+++ b/files/assets/js/core.js
@@ -433,3 +433,11 @@ function logout(t) {
 			location.href = '/'
 		});
 }
+
+const width = (window.innerWidth > 0) ? window.innerWidth : screen.width;
+function focusSearchBar(element)
+{
+	if (width >= 768) {
+		element.focus();
+	}
+}
diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js
index ae3418f21..4741d0021 100644
--- a/files/assets/js/emoji_modal.js
+++ b/files/assets/js/emoji_modal.js
@@ -266,7 +266,7 @@ function switchEmojiTab(e)
 	const className = e.currentTarget.dataset.className;
 
 	emojiSearchBarDOM.value = "";
-	emojiSearchBarDOM.focus();
+	focusSearchBar(emojiSearchBarDOM);
 	emojiNotFoundDOM.hidden = true;
 
 	// Special case: favorites
@@ -567,11 +567,11 @@ function loadEmojis(inputTargetIDName)
 }
 
 document.getElementById('emojiModal').addEventListener('shown.bs.modal', function () {
-	emojiSearchBarDOM.focus();
+	focusSearchBar(emojiSearchBarDOM);
 	setTimeout(() => {
-		emojiSearchBarDOM.focus();
+		focusSearchBar(emojiSearchBarDOM);
 	}, 200);
 	setTimeout(() => {
-		emojiSearchBarDOM.focus();
+		focusSearchBar(emojiSearchBarDOM);
 	}, 1000);
 });
diff --git a/files/assets/js/gif_modal.js b/files/assets/js/gif_modal.js
index 5114db062..0a10b45b1 100644
--- a/files/assets/js/gif_modal.js
+++ b/files/assets/js/gif_modal.js
@@ -15,12 +15,12 @@ function insertGIF(url) {
 }
 
 document.getElementById('gifModal').addEventListener('shown.bs.modal', function () {
-	gifSearchBar.focus();
+	focusSearchBar(gifSearchBar);
 	setTimeout(() => {
-		gifSearchBar.focus();
+		focusSearchBar(gifSearchBar);
 	}, 200);
 	setTimeout(() => {
-		gifSearchBar.focus();
+		focusSearchBar(gifSearchBar);
 	}, 1000);
 });