diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8a1e722..387e77e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,4 @@
+v1.0.149: Fixed Bugs in Multiline Macros
 v1.0.148: Multi-line Macros, Grbl Flashing tool: BlackBox added, Switch to Serial Console on-connect to help ease troubleshooting.
 v1.0.147: Updated lodash Dependancy, update AVRgirl Dependency, added Xpro support to the Grbl Flashing tools
 v1.0.146: Custom Machine profile, Tooltips for Grbl Settings, Alarm Unlock on Alarm Modal, Added Link to Forum on Troubleshooting tab, minor Cosmetics to 3D Viewer, Probe Macros/Console: Only show dialog when probed from Wizard, normal macro/console probes only log to Serial Console now
diff --git a/app/js/macros.js b/app/js/macros.js
index 931796a..63abd0a 100644
--- a/app/js/macros.js
+++ b/app/js/macros.js
@@ -5,7 +5,7 @@ function populateMacroButtons() {
   $("#macros").empty();
   for (i = 0; i < buttonsarray.length; i++) {
     var button = `
-    <button id="macro` + i + `" onclick="sendGcode('` + buttonsarray[i].gcode + `');" class="shortcut outline rounded no-caption m-1 ` + buttonsarray[i].class + `">
+    <button id="macro` + i + `" onclick="sendGcode('` + buttonsarray[i].gcode.replace(/(\r\n|\n|\r)/gm, "\\n") + `');" class="shortcut outline rounded no-caption m-1 ` + buttonsarray[i].class + `">
         <span class="tag"><span onclick="edit(` + i + `, event);" id="edit` + i + `" class="fas fa-cogs"></span></span>
         <span class="caption">` + buttonsarray[i].title + `</span>
         <span class="` + buttonsarray[i].icon + ` icon"></span>
@@ -131,6 +131,8 @@ function edit(i, evt) {
   // fa iconpicker https://github.com/farbelous/fontawesome-iconpicker
   $('#macroicon').iconpicker(options);
   $("#macrocls").val(cls).trigger("change");
+  $('#macrogcode').val(gcode);
+
 
 }
 
diff --git a/package.json b/package.json
index 704db0b..d9e2ac0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.148",
+  "version": "1.0.149",
   "license": "AGPL-3.0",
   "description": "Machine Interface Driver for OpenBuilds",
   "author": "github.com/openbuilds <webmaster@openbuilds.com>",