diff --git a/demos/bootstrap.js b/demos/bootstrap.js
index 79566fcef4..8cc8d38785 100644
--- a/demos/bootstrap.js
+++ b/demos/bootstrap.js
@@ -28,7 +28,8 @@ var widgets = [
 	"accordion",
 	"autocomplete",
 	"button",
-	"datepicker"
+	"datepicker",
+	"dialog"
 ];
 
 function getPath( module ) {
diff --git a/tests/unit/dialog/common-deprecated.js b/tests/unit/dialog/common-deprecated.js
index 7b00912779..69153039ce 100644
--- a/tests/unit/dialog/common-deprecated.js
+++ b/tests/unit/dialog/common-deprecated.js
@@ -1,6 +1,6 @@
 define( [
 	"lib/common",
-	"ui/dialog"
+	"ui/widgets/dialog"
 ], function( common ) {
 
 common.testWidget( "dialog", {
diff --git a/tests/unit/dialog/common.js b/tests/unit/dialog/common.js
index 389b2ddff7..8722d1753b 100644
--- a/tests/unit/dialog/common.js
+++ b/tests/unit/dialog/common.js
@@ -1,6 +1,6 @@
 define( [
 	"lib/common",
-	"ui/dialog"
+	"ui/widgets/dialog"
 ], function( common ) {
 
 common.testWidget( "dialog", {
diff --git a/tests/unit/dialog/core.js b/tests/unit/dialog/core.js
index 770d9f543a..1560c34acd 100644
--- a/tests/unit/dialog/core.js
+++ b/tests/unit/dialog/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/dialog"
+	"ui/widgets/dialog"
 ], function( $ ) {
 
 // TODO add teardown callback to remove dialogs
diff --git a/tests/unit/dialog/deprecated.js b/tests/unit/dialog/deprecated.js
index 1f7087c57e..2d75cad0dc 100644
--- a/tests/unit/dialog/deprecated.js
+++ b/tests/unit/dialog/deprecated.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/dialog"
+	"ui/widgets/dialog"
 ], function( $ ) {
 
 module( "dialog (deprecated): options" );
diff --git a/tests/unit/dialog/events.js b/tests/unit/dialog/events.js
index 0e48b7afab..13c4525011 100644
--- a/tests/unit/dialog/events.js
+++ b/tests/unit/dialog/events.js
@@ -1,7 +1,7 @@
 define( [
 	"jquery",
 	"./helper",
-	"ui/dialog"
+	"ui/widgets/dialog"
 ], function( $, testHelper ) {
 
 module("dialog: events");
diff --git a/tests/unit/dialog/helper.js b/tests/unit/dialog/helper.js
index f84d1d624b..87ca9c172d 100644
--- a/tests/unit/dialog/helper.js
+++ b/tests/unit/dialog/helper.js
@@ -1,7 +1,7 @@
 define( [
 	"jquery",
 	"lib/helper",
-	"ui/dialog"
+	"ui/widgets/dialog"
 ], function( $, helper ) {
 
 return $.extend( helper, {
diff --git a/tests/unit/dialog/methods.js b/tests/unit/dialog/methods.js
index cee0cd3a70..a730350b15 100644
--- a/tests/unit/dialog/methods.js
+++ b/tests/unit/dialog/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/dialog"
+	"ui/widgets/dialog"
 ], function( $ ) {
 
 module("dialog: methods", {
diff --git a/tests/unit/dialog/options.js b/tests/unit/dialog/options.js
index 6de336fd65..ea0885de98 100644
--- a/tests/unit/dialog/options.js
+++ b/tests/unit/dialog/options.js
@@ -1,7 +1,7 @@
 define( [
 	"jquery",
 	"./helper",
-	"ui/dialog",
+	"ui/widgets/dialog",
 	"ui/effect-blind",
 	"ui/effect-explode"
 ], function( $, testHelper ) {
diff --git a/ui/dialog.js b/ui/widgets/dialog.js
similarity index 98%
rename from ui/dialog.js
rename to ui/widgets/dialog.js
index dc66329739..96e004b6c4 100644
--- a/ui/dialog.js
+++ b/ui/widgets/dialog.js
@@ -22,20 +22,19 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
-			"./core",
-			"./version",
-			"./keycode",
-			"./widget",
-			"./widgets/button",
-			"./draggable",
-			"./focusable",
-			"./mouse",
-			"./position",
-			"./resizable",
-			"./safe-active-element",
-			"./safe-blur",
-			"./tabbable",
-			"./unique-id"
+			"./button",
+			"../mouse",
+			"../resizable",
+			"../draggable",
+			"../focusable",
+			"../keycode",
+			"../position",
+			"../safe-active-element",
+			"../safe-blur",
+			"../tabbable",
+			"../unique-id",
+			"../version",
+			"../widget"
 		], factory );
 	} else {