diff --git a/src/browser/webview/mattermost.js b/src/browser/webview/mattermost.js
index dcc03279..8001b63f 100644
--- a/src/browser/webview/mattermost.js
+++ b/src/browser/webview/mattermost.js
@@ -136,7 +136,11 @@ function getCurrentChannelString() {
 }
 
 ipc.on('activate-search-box', (event) => {
-  const search_box = document.getElementsByClassName('search-bar')[0]; // should use id
+  const search_boxes = document.getElementsByClassName('search-bar'); // should use id
+  if (search_boxes.length === 0) {
+    return;
+  }
+  const search_box = search_boxes[0];
   search_box.focus();
-  console.log(getCurrentChannelString());
+  search_box.value = `in:${getCurrentChannelString()} `;
 });
diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index 37bf38db..d487662f 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -70,7 +70,7 @@ var createTemplate = function(mainWindow, config) {
     }, {
       role: 'selectall'
     }, separatorItem, {
-      label: 'Search in Current Channel',
+      label: 'Search in Channel',
       accelerator: 'CmdOrCtrl+F',
       click: (item, focusedWindow) => {
         if (focusedWindow) {