diff --git a/src/renderer/components/dock/pod-log-search.tsx b/src/renderer/components/dock/pod-log-search.tsx
index 3f39db7cb4..8549e9ccaa 100644
--- a/src/renderer/components/dock/pod-log-search.tsx
+++ b/src/renderer/components/dock/pod-log-search.tsx
@@ -40,6 +40,16 @@ export const PodLogSearch = observer((props: PodLogSearchProps) => {
     toNextOverlay();
   }
 
+  const onClear = () => {
+    setSearch("");
+  }
+
+  const onKeyDown = (evt: React.KeyboardEvent<any>) => {
+    if (evt.key === "Enter") {
+      onNextOverlay();
+    }
+  }
+
   useEffect(() => {
     // Refresh search when logs changed
     searchStore.onSearch(logs);
@@ -52,6 +62,8 @@ export const PodLogSearch = observer((props: PodLogSearchProps) => {
         onChange={setSearch}
         closeIcon={false}
         contentRight={totalFinds > 0 && findCounts}
+        onClear={onClear}
+        onKeyDown={onKeyDown}
       />
       <Icon
         material="keyboard_arrow_up"
@@ -68,7 +80,7 @@ export const PodLogSearch = observer((props: PodLogSearchProps) => {
       <Icon
         material="close"
         tooltip={_i18n._(t`Clear`)}
-        onClick={() => setSearch("")}
+        onClick={onClear}
       />
     </div>
   );
diff --git a/src/renderer/components/input/input.tsx b/src/renderer/components/input/input.tsx
index 9bd67f8887..cd3e998a55 100644
--- a/src/renderer/components/input/input.tsx
+++ b/src/renderer/components/input/input.tsx
@@ -214,6 +214,10 @@ export class Input extends React.Component<InputProps, State> {
   onKeyDown(evt: React.KeyboardEvent<any>) {
     const modified = evt.shiftKey || evt.metaKey || evt.altKey || evt.ctrlKey;
 
+    if (this.props.onKeyDown) {
+      this.props.onKeyDown(evt);
+    }
+
     switch (evt.key) {
     case "Enter":
       if (this.props.onSubmit && !modified && !evt.repeat) {