diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
index 419a037fa3..4e4a317591 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.controller.js
@@ -1,7 +1,34 @@
 (function () {
     "use strict";
 
-    function ScriptsCreateController() {
+    function ScriptsCreateController($scope, $location, navigationService) {
+
+        var vm = this;
+        var node = $scope.dialogOptions.currentNode;
+
+        vm.creatingFolder = false;
+        vm.folderName = "";
+        vm.fileExtension = "";
+
+        vm.createFile = createFile;
+        vm.showCreateFolder = showCreateFolder;
+        vm.createFolder = createFolder;
+
+        function createFile(fileExtension) {
+            $location.search('create', null);
+            $location.search('fileExtension', null);
+            $location.path("/settings/scripts/edit/" + node.id).search("create", "true").search("fileExtension", fileExtension);
+            navigationService.hideMenu();
+        }
+
+        function showCreateFolder() {
+            vm.creatingFolder = true;
+        }
+
+        function createFolder() {
+            alert("create folder");
+        }
+
     }
 
     angular.module("umbraco").controller("Umbraco.Editors.Scripts.CreateController", ScriptsCreateController);
diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
index 99cf043e35..2836d44d2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/scripts/create.html
@@ -1,5 +1,53 @@
-<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Scripts.CreateController" ng-cloak>
-    <div class="umb-pane">
-        <h5><localize key="create_createUnder">Create an item under</localize> {{currentNode.name}}</h5>
+<div class="umbracoDialog umb-dialog-body with-footer" ng-controller="Umbraco.Editors.Scripts.CreateController as vm" ng-cloak>
+
+    <div class="umb-pane" ng-if="!vm.creatingFolder">
+        <h5><localize key="create_createUnder">Create new partial view under</localize> {{currentNode.name}}</h5>
+
+        <ul class="umb-actions umb-actions-child">
+            <li>
+                <a href="" umb-auto-focus ng-click="vm.createFile('.js')">
+                    <i class="large icon-script"></i>
+                    <span class="menu-label">.js file</span>
+                </a>
+            </li>
+            <li>
+                <a href="" ng-click="vm.createFile('.xml')">
+                    <i class="large icon-script"></i>
+                    <span class="menu-label">.xml file</span>
+                </a>
+            </li>
+            <li>
+                <a href="" ng-click="vm.showCreateFolder()">
+                    <i class="large icon-folder"></i>
+                    <span class="menu-label"><localize key="general_folder"></localize></span>
+                </a>
+            </li>
+        </ul>
+
     </div>
+
+    <div class="umb-pane" ng-if="vm.creatingFolder">
+        <form novalidate name="createFolderForm"
+              ng-submit="vm.createFolder()"
+              val-form-manager>
+            
+            <div ng-show="error">
+                <h5 class="text-error">{{error.errorMsg}}</h5>
+                <p class="text-error">{{error.data.message}}</p>
+            </div>
+
+            <umb-control-group label="Enter a folder name" hide-label="false">
+                <input type="text" name="folderName" ng-model="vm.folderName" class="umb-textstring textstring input-block-level" umb-auto-focus required />
+            </umb-control-group>
+
+            <button type="submit" class="btn btn-primary"><localize key="general_create">Create</localize></button>
+        </form>
+    </div>
+
+</div>
+
+<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-if="!vm.creatingFolder">
+    <button class="btn" ng-click="nav.hideDialog(true)">
+        <localize key="buttons_somethingElse">Do something else</localize>
+    </button>
 </div>