diff --git a/termui/bug_table.go b/termui/bug_table.go
index 5b25ce111d13ffd1f5f3024ed71be632612af907..7cd3ba9a2f7ee19e44d6b6427a00bc6c3dc6ebac 100644
--- a/termui/bug_table.go
+++ b/termui/bug_table.go
@@ -120,7 +120,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
 		v.Frame = false
 		v.BgColor = gocui.ColorBlue
 
-		fmt.Fprintf(v, "[Esc] Quit [q] Query [←↓↑→,hjkl] Navigation [enter] Open bug [n] New bug [i] Pull [o] Push")
+		fmt.Fprintf(v, "[q] Quit [s] Search [←↓↑→,hjkl] Navigation [enter] Open bug [n] New bug [i] Pull [o] Push")
 	}
 
 	_, err = g.SetCurrentView(bugTableView)
@@ -129,7 +129,7 @@ func (bt *bugTable) layout(g *gocui.Gui) error {
 
 func (bt *bugTable) keybindings(g *gocui.Gui) error {
 	// Quit
-	if err := g.SetKeybinding(bugTableView, gocui.KeyEsc, gocui.ModNone, quit); err != nil {
+	if err := g.SetKeybinding(bugTableView, 'q', gocui.ModNone, quit); err != nil {
 		return err
 	}
 
@@ -204,7 +204,7 @@ func (bt *bugTable) keybindings(g *gocui.Gui) error {
 	}
 
 	// Query
-	if err := g.SetKeybinding(bugTableView, 'q', gocui.ModNone,
+	if err := g.SetKeybinding(bugTableView, 's', gocui.ModNone,
 		bt.changeQuery); err != nil {
 		return err
 	}