diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/block/completion/TerminalCompletionUtil.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/block/completion/TerminalCompletionUtil.kt
index 78684392710d..773394f23226 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/block/completion/TerminalCompletionUtil.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/block/completion/TerminalCompletionUtil.kt
@@ -12,12 +12,16 @@ import javax.swing.Icon
 
 internal object TerminalCompletionUtil {
   fun getNextSuggestionsString(suggestion: ShellCompletionSuggestion): String {
+    var separator: String? = null
     val result = when (suggestion) {
       is ShellCommandSpec -> getNextOptionsAndArgumentsString(suggestion)
-      is ShellOptionSpec -> getNextArgumentsString(suggestion.arguments)
+      is ShellOptionSpec -> {
+        separator = suggestion.separator
+        getNextArgumentsString(suggestion.arguments)
+      }
       else -> ""
     }
-    return if (result.isNotEmpty()) " $result" else ""
+    return if (result.isNotEmpty()) "${separator ?: " "}$result" else ""
   }
 
   /** Returns required options and all arguments */