diff --git a/src/history.tsx b/src/history.tsx
index fb5bd1324..998073695 100644
--- a/src/history.tsx
+++ b/src/history.tsx
@@ -337,7 +337,6 @@ class HistoryView extends React.Component<{}, {}> {
         let remoteId : string = null;
         return (
             <div className={cn("history-view", "alt-view", {"is-hidden": isHidden})}>
-                <div className="close-button" onClick={this.clickCloseHandler}><i className="fa-sharp fa-solid fa-xmark"></i></div>
                 <div className="header">
                     <div className="history-title">
                         HISTORY
@@ -407,6 +406,9 @@ class HistoryView extends React.Component<{}, {}> {
                             </div>
                         </div>
                     </div>
+                    <div className="close-div">
+                        <i onClick={this.clickCloseHandler} className="fa-sharp fa-solid fa-xmark"/>
+                    </div>
                 </div>
                 <div className={cn("control-bar", "is-top", {"is-hidden": (items.length == 0)})}>
                     <div className="control-checkbox" onClick={this.handleControlCheckbox}>
diff --git a/src/main.tsx b/src/main.tsx
index ee879e0fd..7e6fbf588 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -2386,10 +2386,10 @@ class MainSideBar extends React.Component<{}, {}> {
                         <li className="new-session"><a onClick={() => this.handleNewSharedSession()}><i className="fa-sharp fa-solid fa-plus"/> New Session</a></li>
                     </ul>
                     <ul className="menu-list" style={{marginTop: 20}}>
-                        <li className="menu-history"><a onClick={this.handleHistoryClick} className={cn({"is-active": (mainView == "history")})}><i className="fa-sharp fa-solid fa-clock"/> HISTORY</a></li>
+                        <li className="menu-history"><a onClick={this.handleHistoryClick} className={cn({"is-active": (mainView == "history")})}><i className="fa-sharp fa-solid fa-clock"/> HISTORY <span className="hotkey">&#x2318;H</span></a></li>
                     </ul>
                     <ul className="menu-list">
-                        <li className="menu-bookmarks"><a onClick={this.handleBookmarksClick} className={cn({"is-active": (mainView == "bookmarks")})}><i className="fa-sharp fa-solid fa-bookmark"/> BOOKMARKS <span>&#x2318;B</span></a></li>
+                        <li className="menu-bookmarks"><a onClick={this.handleBookmarksClick} className={cn({"is-active": (mainView == "bookmarks")})}><i className="fa-sharp fa-solid fa-bookmark"/> BOOKMARKS <span className="hotkey">&#x2318;B</span></a></li>
                     </ul>
                     <p className="menu-label display-none">
                         Playbooks
diff --git a/src/model.ts b/src/model.ts
index 173543ba3..551c85129 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -1870,6 +1870,7 @@ class HistoryViewModel {
     }
 
     reSearch() : void {
+        this.setActiveItem(null);
         GlobalCommandRunner.historyView(this._getSearchParams());
     }
 
@@ -2480,10 +2481,7 @@ class Model {
     }
 
     onHCmd(e : any, mods : KeyModsType) {
-        let focusedLine = this.getFocusedLine();
-        if (focusedLine != null && focusedLine.cmdInputFocus) {
-            this.inputModel.openHistory();
-        }
+        GlobalModel.historyViewModel.reSearch();
     }
 
     getFocusedLine() : LineFocusType {
diff --git a/src/sh2.less b/src/sh2.less
index fbc6c46d7..6028f4d29 100644
--- a/src/sh2.less
+++ b/src/sh2.less
@@ -203,8 +203,18 @@ body::-webkit-scrollbar {
 .history-view {
     color: #ccc;
 
-    .close-button {
-        top: 10px;
+    .close-div {
+        padding-top: 10px;
+        font-size: 24px;
+
+        i {
+            padding: 5px 5px 5px 10px;
+            cursor: pointer;
+        }
+
+        i:hover {
+            color: #fff;
+        }
     }
 
     .header {
@@ -993,6 +1003,16 @@ body::-webkit-scrollbar {
         li.menu-bookmarks {
             margin-left: -10px;
         }
+
+        li {
+            .hotkey {
+                visibility: hidden;
+            }
+
+            &:hover .hotkey {
+                visibility: visible;
+            }
+        }
     }
 
     .menu-list.remotes-menu-list {