diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
index f236244f89..1614e90b89 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
@@ -143,6 +143,7 @@
         vm.openMasterTemplateOverlay = openMasterTemplateOverlay;
         vm.selectMasterTemplate = selectMasterTemplate;
         vm.getMasterTemplateName = getMasterTemplateName;
+        vm.removeMasterTemplate = removeMasterTemplate;
 
         function openInsertOverlay() {
 
@@ -403,6 +404,15 @@
             
         }
 
+        function removeMasterTemplate() {
+
+            vm.template.masterTemplateAlias = null;
+
+            // call set layout with no paramters to set layout to null
+            setLayout();
+
+        }
+
         function setLayout(templatePath){
             
             var templateCode = vm.editor.getValue();
diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
index d2dd2fdd0e..e03f593c90 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -25,10 +25,23 @@
                 <div class="flex" style="margin-bottom: 30px;">
 
                     <div class="flex">
-                        <a class="btn btn-link" ng-click="vm.openMasterTemplateOverlay()">
-                            <i class="icon icon-layout" style="margin-right:5px;"></i>
-                            <span class="bold">Master template:</span> {{ vm.getMasterTemplateName(vm.template.masterTemplateAlias, vm.templates) }}
-                        </a>
+
+                        <div ng-class="{'btn-group umb-era-button-group': vm.template.masterTemplateAlias}" style="margin-right: 10px;">
+                            
+                            <button
+                                type="button"
+                                class="umb-era-button umb-button--s"
+                                ng-click="vm.openMasterTemplateOverlay()">
+                                <i class="icon icon-layout"></i>
+                                <span class="bold">Master template:</span> <span style="margin-left: 5px;">{{ vm.getMasterTemplateName(vm.template.masterTemplateAlias, vm.templates) }}</span>
+                            </button>
+
+                            <a ng-if="vm.template.masterTemplateAlias" ng-click="vm.removeMasterTemplate()" class="umb-era-button umb-button--s dropdown-toggle umb-button-group__toggle">
+                                <span class="icon icon-wrong"></span>
+                            </a>
+
+                        </div>
+                        
                     </div>
 
                     <div class="flex" style="margin-left: auto;">