diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/organize.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/organize.controller.js
new file mode 100644
index 0000000000..f1ba776714
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/organize.controller.js
@@ -0,0 +1,22 @@
+(function() {
+    "use strict";
+
+    function OrganizeController(scope, umbRequestHelper, http) {
+        var allTemplatesUrl = umbRequestHelper.getApiUrl("templateApiBaseUrl", "GetAll");
+
+        http.get(allTemplatesUrl)
+            .then(function(result) {
+                scope.masterPages = result.data;
+            });
+    }
+
+    angular.module("umbraco")
+        .controller("Umbraco.Dialogs.Template.OrganizeController",
+        [
+            "$scope",
+            "umbRequestHelper",
+            "$http",
+            OrganizeController
+        ]);
+
+}());
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/organize.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/organize.html
new file mode 100644
index 0000000000..ad9f1b8d0e
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/organize.html
@@ -0,0 +1,21 @@
+<div ng-controller="Umbraco.Dialogs.Template.OrganizeController">
+    <div class="row">
+        <label>Select master page</label>
+        <div class="btn-group">
+            <a class="btn btn-link dropdown-toggle"
+               data-toggle="dropdown" href="#">
+                {{structure.masterPage}}
+                <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu">
+                <li ng-repeat="page in masterPages">
+                    <a href ng-click="selectMasterPage(page)">
+                        {{page.name}}
+                    </a>
+                </li>
+
+            </ul>
+        </div>
+    </div>
+
+</div>
\ No newline at end of file
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 28244b1a7c..ea2eb2167d 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
@@ -72,6 +72,7 @@
         vm.openDictionaryItemOverlay = openDictionaryItemOverlay;
         vm.openQueryBuilderOverlay = openQueryBuilderOverlay;
         vm.openMacroOverlay = openMacroOverlay;
+        vm.openOrganizeOverlay = openOrganizeOverlay;
 
         function openMacroOverlay() {
            
@@ -133,6 +134,21 @@
             };
         }
 
+        function openOrganizeOverlay() {
+            vm.organizeOverlay = {
+                view: "/umbraco/views/common/dialogs/template/organize.html",
+                show: true,
+                template: vm.template,
+                submit: function(model) {
+                    vm.setLayout(model);
+                },
+                close: function(model) {
+                    vm.organizeOverlay.show = false;
+                    vm.organizeOverlay = null;
+                }
+            }
+        }
+
         vm.init();
 
     }
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 eeab721902..0a9e2c5be4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.html
@@ -28,6 +28,8 @@
                         <i class="icon-book-alt"></i></a>
                     <a href ng-click="vm.openMacroOverlay()"class="btn">
                         <i class="icon-settings-alt"></i></a>
+                    <a href ng-click="vm.openOrganizeOverlay()"class="btn">
+                        <i class="icon-settings-alt"></i></a>
                 </div>
 
                 <div class="btn-group">  
@@ -93,4 +95,11 @@
         view="vm.queryBuilderOverlay.view">
     </umb-overlay>
 
+    <umb-overlay
+        ng-if="vm.organizeOverlay.show"
+        model="vm.organizeOverlay"
+        position="right"
+        view="vm.organizeOverlay.view">
+    </umb-overlay>
+
 </div>