diff --git a/src/app/workspace/cmdinput/cmdInput.less b/src/app/workspace/cmdinput/cmdInput.less
index b14a223aa..772db8b22 100644
--- a/src/app/workspace/cmdinput/cmdInput.less
+++ b/src/app/workspace/cmdinput/cmdInput.less
@@ -76,7 +76,7 @@
 
     .cmd-input-field {
         position: relative;
-        padding-right: 22em;
+        padding-right: 17em;
 
         .cmd-hints {
             position: absolute;
@@ -146,7 +146,7 @@
             }
             .cmd-btn {
                 display: inline-block;
-                margin-right: 1em;
+                margin-right: 0;
                 padding: 0.2em 0.7rem;
                 opacity: 0.5;
                 cursor: pointer;
diff --git a/src/app/workspace/cmdinput/cmdinput.tsx b/src/app/workspace/cmdinput/cmdinput.tsx
index da53c63c3..0ea52420b 100644
--- a/src/app/workspace/cmdinput/cmdinput.tsx
+++ b/src/app/workspace/cmdinput/cmdinput.tsx
@@ -164,7 +164,7 @@ class CmdInput extends React.Component<{}, {}> {
                         )}
                         {focusVal && (
                             <div onMouseDown={this.clickHistoryHint} className="cmd-btn hoverEffect">
-                                {historyShow ? "close history (esc)" : "show history (ctrl-r)"}
+                                {historyShow ? "close (esc)" : "history (crtl-r)"}
                             </div>
                         )}
                         <ExecIcon