diff --git a/platform/forms/res/templates/controls/dialog.html b/platform/forms/res/templates/controls/dialog.html
new file mode 100644
index 0000000000..05b0d39d43
--- /dev/null
+++ b/platform/forms/res/templates/controls/dialog.html
@@ -0,0 +1,4 @@
+<mct-control ng-controller="DialogButtonController as dialog"
+             key="'button'"
+             structure="dialog.getStructure()">
+</mct-control>
\ No newline at end of file
diff --git a/platform/forms/src/controllers/DialogButtonController.js b/platform/forms/src/controllers/DialogButtonController.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/platform/forms/test/controllers/DialogButtonControllerSpec.js b/platform/forms/test/controllers/DialogButtonControllerSpec.js
new file mode 100644
index 0000000000..a67ccdcbd1
--- /dev/null
+++ b/platform/forms/test/controllers/DialogButtonControllerSpec.js
@@ -0,0 +1,116 @@
+/*global define,describe,it,expect,beforeEach,waitsFor,jasmine*/
+
+define(
+    ["../../src/controllers/DialogButtonController"],
+    function (DialogButtonController) {
+        "use strict";
+
+        describe("A dialog button controller", function () {
+            var mockScope,
+                mockDialogService,
+                mockPromise,
+                testStructure,
+                controller;
+
+            beforeEach(function () {
+                mockScope = jasmine.createSpyObj(
+                    '$scope',
+                    [ '$watch' ]
+                );
+                mockDialogService = jasmine.createSpyObj(
+                    'dialogService',
+                    [ 'getUserInput' ]
+                );
+                mockPromise = jasmine.createSpyObj(
+                    'promise',
+                    [ 'then' ]
+                );
+                testStructure = {
+                    key: "testKey",
+                    name: "A Test",
+                    glyph: "T",
+                    description: "Test description",
+                    control: "dialog-button",
+                    title: "Test title",
+                    dialog: {
+                        "control": "textfield",
+                        "name": "Inner control"
+                    }
+                };
+
+                mockScope.ngModel = { testKey: "initial test value" };
+                mockScope.structure = testStructure;
+
+                mockDialogService.getUserInput.andReturn(mockPromise);
+
+                controller = new DialogButtonController(
+                    mockScope,
+                    mockDialogService
+                );
+            });
+
+            it("provides a structure for a button control", function () {
+                var buttonStructure;
+
+                // Template is just a mct-control pointing to a button
+                // control, so this controller needs to set up all the
+                // logic for showing a dialog and collecting user input
+                // when that button gets clicked.
+                expect(mockScope.$watch).toHaveBeenCalledWith(
+                    "structure", // As passed in via mct-control
+                    jasmine.any(Function)
+                );
+
+                mockScope.$watch.mostRecentCall.args(testStructure);
+
+                buttonStructure = controller.getButtonStructure();
+                expect(buttonStructure.glyph).toEqual(testStructure.glyph);
+                expect(buttonStructure.description).toEqual(testStructure.description);
+                expect(buttonStructure.name).toEqual(testStructure.name);
+                expect(buttonStructure.click).toEqual(jasmine.any(Function));
+            });
+
+            it("shows a dialog when clicked", function () {
+                mockScope.$watch.mostRecentCall.args(testStructure);
+                // Verify precondition - no dialog shown
+                expect(mockDialogService.getUserInput).not.toHaveBeenCalled();
+                // Click!
+                controller.getButtonStructure().click();
+                // Should have shown a dialog
+                expect(mockDialogService.getUserInput).toHaveBeenCalled();
+            });
+
+            it("stores user input to the model", function () {
+                var key, input = {};
+                // Show dialog, click...
+                mockScope.$watch.mostRecentCall.args(testStructure);
+                controller.getButtonStructure().click();
+                // Should be listening to 'then'
+                expect(mockPromise.then)
+                    .toHaveBeenCalledWith(jasmine.any(Function));
+                // Find the key that the dialog should return
+                key = mockDialogService.getUserInput.mostRecentCall
+                    .args[0].sections[0].rows[0].key;
+                // Provide 'user input'
+                input[key] = "test user input";
+                // Resolve the promise with it
+                mockPromise.then.mostRecentCall.args[0](input);
+                // ... should have been placed into the model
+                expect(mockScope.ngModel.testKey).toEqual("test user input");
+            });
+
+            it("supplies initial model state to the dialog", function () {
+                var key, state;
+                mockScope.$watch.mostRecentCall.args(testStructure);
+                controller.getButtonStructure().click();
+                // Find the key that the dialog should return
+                key = mockDialogService.getUserInput.mostRecentCall
+                    .args[0].sections[0].rows[0].key;
+                // Get the initial state provided to the dialog
+                state = mockDialogService.getUserInput.mostRecentCall.args[1];
+                // Should have had value from ngModel stored to that key
+                expect(state[key]).toEqual("initial test value");
+            });
+        });
+    }
+);
\ No newline at end of file
diff --git a/platform/forms/test/suite.json b/platform/forms/test/suite.json
index ad1c50e39e..be4d6151db 100644
--- a/platform/forms/test/suite.json
+++ b/platform/forms/test/suite.json
@@ -4,5 +4,6 @@
     "controllers/ColorController",
     "controllers/CompositeController",
     "controllers/DateTimeController",
+    "controllers/DialogButtonController",
     "controllers/FormController"
 ]
\ No newline at end of file