diff --git a/renderdocui/Windows/EventBrowser.Designer.cs b/renderdocui/Windows/EventBrowser.Designer.cs
index f3286f3b3..f86bb871c 100644
--- a/renderdocui/Windows/EventBrowser.Designer.cs
+++ b/renderdocui/Windows/EventBrowser.Designer.cs
@@ -300,6 +300,7 @@
             this.findEvent.ToolTipText = "Find an event by type or name";
             this.findEvent.Leave += new System.EventHandler(this.jumpFind_Leave);
             this.findEvent.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.findEvent_KeyPress);
+            this.findEvent.KeyDown += new System.Windows.Forms.KeyEventHandler(findEvent_KeyDown);
             this.findEvent.TextChanged += new System.EventHandler(this.findEvent_TextChanged);
             // 
             // closeFind
diff --git a/renderdocui/Windows/EventBrowser.cs b/renderdocui/Windows/EventBrowser.cs
index 3e39243cc..750d54cdb 100644
--- a/renderdocui/Windows/EventBrowser.cs
+++ b/renderdocui/Windows/EventBrowser.cs
@@ -878,6 +878,25 @@ namespace renderdocui.Windows
             findHighlight.Enabled = false;
         }
 
+        private void findEvent_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.F3)
+            {
+                if (findHighlight.Enabled)
+                {
+                    findHighlight.Enabled = false;
+                    findHighlight_Tick(sender, null);
+                }
+
+                if (findEvent.Text.Length > 0)
+                {
+                    Find(e.Shift ? false : true);
+                }
+
+                e.Handled = true;
+            }
+        }
+
         private void findEvent_KeyPress(object sender, KeyPressEventArgs e)
         {
             // escape key