diff --git a/public/javascripts/jstoolbar/markdown.js b/public/javascripts/jstoolbar/markdown.js
index ae2725269..902babab6 100644
--- a/public/javascripts/jstoolbar/markdown.js
+++ b/public/javascripts/jstoolbar/markdown.js
@@ -153,7 +153,7 @@ jsToolBar.prototype.elements.bq = {
     wiki: function() {
       this.encloseLineSelection('','',function(str) {
         str = str.replace(/\r/g,'');
-        return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
+        return str.replace(/(\n|^)( *)([^\n]*)/g,"$1> $2$3");
       });
     }
   }
@@ -167,7 +167,7 @@ jsToolBar.prototype.elements.unbq = {
     wiki: function() {
       this.encloseLineSelection('','',function(str) {
         str = str.replace(/\r/g,'');
-        return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
+        return str.replace(/(\n|^) *(> ?)?( *)([^\n]*)/g,"$1$3$4");
       });
     }
   }
diff --git a/public/javascripts/jstoolbar/textile.js b/public/javascripts/jstoolbar/textile.js
index 76d2170cc..bc994d288 100644
--- a/public/javascripts/jstoolbar/textile.js
+++ b/public/javascripts/jstoolbar/textile.js
@@ -153,7 +153,7 @@ jsToolBar.prototype.elements.bq = {
     wiki: function() {
       this.encloseLineSelection('','',function(str) {
         str = str.replace(/\r/g,'');
-        return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
+        return str.replace(/(\n|^)( *)([^\n]*)/g,"$1> $2$3");
       });
     }
   }
@@ -167,7 +167,7 @@ jsToolBar.prototype.elements.unbq = {
     wiki: function() {
       this.encloseLineSelection('','',function(str) {
         str = str.replace(/\r/g,'');
-        return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
+        return str.replace(/(\n|^) *(> ?)?( *)([^\n]*)/g,"$1$3$4");
       });
     }
   }