       close += "\n"
 
     if char in settings.get('charactersToAddSpaceOnSurround') and isSingleLineText(text)
-      open + ' ' + text + ' ' + close
-    else
-      open + text + close
+      text = ' ' + text + ' '
+
+    open + text + close
 
   deleteSurround: (text) ->
     [open, innerText..., close] = text

    super

  focusInput: ->
    @inputUI = @newInputUI()
    @inputUI.onDidConfirm(@onConfirm.bind(this))
    @inputUI.onDidCancel(@cancelOperation.bind(this))
    @inputUI.focus()

  getPair: (char) ->
    pair = _.detect(@pairs, (pair) -> char in pair)

  @description: "Change surround character, from char is auto-detected from enclosed and forwarding area"
  target: "AAnyPairAllowForwarding"

# -------------------------
# FIXME
# Currently native editor.joinLines() is better for cursor position setting
# So I use native methods for a meanwhile.
