diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js b/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js
index 58d5b0ed91..da0d4b9c70 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js
@@ -11,8 +11,8 @@ angular.module("umbraco.filters").filter('simpleMarkdown', function () {
     }
 
     return text
-      .replace(/\*\*(.*)\*\*/gim, '<b>$1</b>')
-      .replace(/\*(.*)\*/gim, '<i>$1</i>')
+      .replace(/\*\*(.+?)\*\*/gim, '<b>$1</b>')
+      .replace(/\*(.+?)\*/gim, '<i>$1</i>')
       .replace(/!\[(.*?)\]\((.*?)\)/gim, "<img alt='$1' src='$2' />")
       .replace(/\[(.*?)\]\((.*?)\)/gim, "<a href='$2' target='_blank' rel='noopener' class='underline'>$1</a>")
       .replace(/\n/g, '<br />').trim();
diff --git a/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js.js b/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js.js
index d33b96916a..f3c242f55d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js.js
+++ b/src/Umbraco.Web.UI.Client/src/common/filters/simpleMarkdown.filter.js.js
@@ -11,8 +11,8 @@ angular.module("umbraco.filters").filter('simpleMarkdown', function () {
     }
 
     return text
-      .replace(/\*\*(.*)\*\*/gim, '<b>$1</b>')
-      .replace(/\*(.*)\*/gim, '<i>$1</i>')
+      .replace(/\*\*(.+?)\*\*/gim, '<b>$1</b>')
+      .replace(/\*(.+?)\*/gim, '<i>$1</i>')
       .replace(/!\[(.*?)\]\((.*?)\)/gim, "<img alt='$1' src='$2' />")
       .replace(/\[(.*?)\]\((.*?)\)/gim, "<a href='$2' target='_blank' class='underline'>$1</a>")
       .replace(/\n/g, '<br />').trim();