diff --git a/src/lib/defaultCommands.js b/src/lib/defaultCommands.js
index 2365405c4..92d4204e9 100644
--- a/src/lib/defaultCommands.js
+++ b/src/lib/defaultCommands.js
@@ -544,11 +544,15 @@ var defaultCmds = {
 						editor.wysiwygEditorInsertHtml(
 							'<a href="' +
 							'mailto:' + escape.entities(email) + '">' +
-								escape.entities((text || email)) +
-							'</a>'
+								escape.entities(text || email) +
+							'</a>&#8203;'
 						);
 					} else {
-						editor.execCommand('createlink', 'mailto:' + email);
+						editor.wysiwygEditorInsertHtml(
+							'<a href="' +
+							'mailto:' + escape.entities(email) + '">',
+							'</a>&#8203;'
+						);
 					}
 				}
 			);
@@ -597,10 +601,13 @@ var defaultCmds = {
 					editor.wysiwygEditorInsertHtml(
 						'<a href="' + escape.entities(url) + '">' +
 							escape.entities(text || url) +
-						'</a>'
+						'</a>&#8203;'
 					);
 				} else {
-					editor.execCommand('createlink', url);
+					editor.wysiwygEditorInsertHtml(
+						'<a href="' + escape.entities(url) + '">',
+						'</a>&#8203;'
+					);
 				}
 			});
 		},