diff --git a/src/mode/modeHandler.ts b/src/mode/modeHandler.ts
index 7ca5cd62e27..8ffbdf6ec68 100644
--- a/src/mode/modeHandler.ts
+++ b/src/mode/modeHandler.ts
@@ -1670,12 +1670,12 @@ export class ModeHandler implements vscode.Disposable {
     this.vimState.postponedCodeViewChanges = [];
 
     if (this.currentMode.name === ModeName.SearchInProgressMode) {
-      this.setStatusBarText(`Searching for: ${ this.vimState.globalState.searchState!.searchString }`);
+      this.setStatusBarText(`Searching for: ${this.vimState.globalState.searchState!.searchString}`);
     } else if (this.currentMode.name === ModeName.EasyMotionMode) {
       // Update all EasyMotion decorations
       this._vimState.easyMotion.updateDecorations();
 
-      this.setStatusBarText(`Current depth: ${ this.vimState.easyMotion.accumulation }`);
+      this.setStatusBarText(`Current depth: ${this.vimState.easyMotion.accumulation}`);
     } else {
       this._renderStatusBar();
     }
@@ -1697,6 +1697,15 @@ export class ModeHandler implements vscode.Disposable {
         currentCommandText = ` ${ this._vimState.globalState.searchState!.searchString }`;
       }
 
+      if (this._vimState.currentMode === ModeName.SurroundInputMode) {
+        if (this._vimState.surround !== undefined) {
+          const surroundText = this._vimState.surround.replacement;
+          if (surroundText !== undefined) {
+            currentCommandText = surroundText;
+          }
+        }
+      }
+
       this.setStatusBarText(`${ modeText }${ currentCommandText }${ macroText }`);
   }