diff --git a/tt-rss.js b/tt-rss.js
index 911e3b1e5..05fefea3a 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -541,7 +541,10 @@ function quickMenuGo(opid) {
 		}
 	
 		if (opid == "qmcSearch") {
-			displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+			displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+				function() { 
+					document.forms['search_form'].query.focus();
+				});
 			return;
 		}
 	
@@ -1098,7 +1101,10 @@ function hotkey_handler(e) {
 			}
 
 			if (keycode == 191 || keychar == '/') { // /
-				displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+				displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+					function() { 
+						document.forms['search_form'].query.focus();
+					});
 				return false;
 			}