diff --git a/files/assets/js/formatting.js b/files/assets/js/formatting.js
index 9605ba61c..d58097913 100644
--- a/files/assets/js/formatting.js
+++ b/files/assets/js/formatting.js
@@ -32,11 +32,13 @@
 		};
 	};
 	var enclose = function(mark) {
-		var re = new RegExp(escape(mark) + '(\\S.*?\\S|\\S)' + escape(mark), 'g');
+		var re = new RegExp(escape(mark) + '(\\S[^]*?\\S|\\S)' + escape(mark), 'g');
 		return select(function(selection) {
 			var replacement = selection.replace(re, '$1');
 			if (replacement.length == selection.length)
-				replacement = mark + replacement + mark;
+				replacement = replacement.replace(/\S[^]*\S|\S/, function (str) {
+					return mark + str + mark;
+				});
 			return replacement;
 		});
 	};