diff --git a/src/renderer/components/dock/logs/search.tsx b/src/renderer/components/dock/logs/search.tsx
index 850820d488..ae633f2a5d 100644
--- a/src/renderer/components/dock/logs/search.tsx
+++ b/src/renderer/components/dock/logs/search.tsx
@@ -52,7 +52,11 @@ export const LogSearch = observer(({ onSearch, scrollToOverlay, model: { logTabD
 
   const onKeyDown = (evt: React.KeyboardEvent<any>) => {
     if (evt.key === "Enter") {
-      onNextOverlay();
+      if (evt.shiftKey) {
+        onPrevOverlay();
+      } else {
+        onNextOverlay();
+      }
     }
   };
 
diff --git a/src/renderer/components/input/search-input.tsx b/src/renderer/components/input/search-input.tsx
index a004041e9d..36bcc135c4 100644
--- a/src/renderer/components/input/search-input.tsx
+++ b/src/renderer/components/input/search-input.tsx
@@ -50,13 +50,9 @@ export class SearchInput extends React.Component<Props> {
 
   @boundMethod
   onKeyDown(evt: React.KeyboardEvent<any>) {
-    if (this.props.onKeyDown) {
-      this.props.onKeyDown(evt);
-    }
-    // clear on escape-key
-    const escapeKey = evt.nativeEvent.code === "Escape";
+    this.props.onKeyDown?.(evt);
 
-    if (escapeKey) {
+    if (evt.nativeEvent.code === "Escape") {
       this.clear();
       evt.stopPropagation();
     }
@@ -87,6 +83,7 @@ export class SearchInput extends React.Component<Props> {
         onKeyDown={this.onKeyDown}
         iconRight={rightIcon}
         ref={this.inputRef}
+        blurOnEnter={false}
       />
     );
   }