diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index c96aa8e59..3e29b979f 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -281,6 +281,9 @@ namespace FlaxEditor.Windows
             _view.OnDelete += Delete;
             _view.OnDuplicate += Duplicate;
             _view.OnPaste += Paste;
+
+            _view.InputActions.Add(options => options.Search, () => _itemsSearchBox.Focus());
+            InputActions.Add(options => options.Search, () => _itemsSearchBox.Focus());
         }
 
         private ContextMenu OnViewDropdownPopupCreate(ComboBox comboBox)
diff --git a/Source/Editor/Windows/OutputLogWindow.cs b/Source/Editor/Windows/OutputLogWindow.cs
index 87d18246a..cd76412c8 100644
--- a/Source/Editor/Windows/OutputLogWindow.cs
+++ b/Source/Editor/Windows/OutputLogWindow.cs
@@ -65,6 +65,11 @@ namespace FlaxEditor.Windows
             /// </summary>
             public OutputLogWindow Window;
 
+            /// <summary>
+            /// The input actions collection to processed during user input.
+            /// </summary>
+            public InputActionsContainer InputActions = new InputActionsContainer();
+
             /// <summary>
             /// The default text style.
             /// </summary>
@@ -80,6 +85,14 @@ namespace FlaxEditor.Windows
             /// </summary>
             public TextBlockStyle ErrorStyle;
 
+            /// <inheritdoc />
+            public override bool OnKeyDown(KeyboardKeys key)
+            {
+                if (InputActions.Process(Editor.Instance, this, key))
+                    return true;
+                return base.OnKeyDown(key);
+            }
+
             /// <inheritdoc />
             protected override void OnParseTextBlocks()
             {
@@ -201,6 +214,9 @@ namespace FlaxEditor.Windows
             // Setup editor options
             Editor.Options.OptionsChanged += OnEditorOptionsChanged;
             OnEditorOptionsChanged(Editor.Options.Options);
+            
+            _output.InputActions.Add(options => options.Search, () => _searchBox.Focus());
+            InputActions.Add(options => options.Search, () => _searchBox.Focus());
 
             GameCooker.Event += OnGameCookerEvent;
             ScriptsBuilder.CompilationFailed += OnScriptsCompilationFailed;