diff --git a/app/index.html b/app/index.html
index 3700b4f..bcc6e5e 100644
--- a/app/index.html
+++ b/app/index.html
@@ -66,6 +66,7 @@
   <script src="/scripts/app/components/modal_dialog_component.js"></script>
   <script src="/scripts/app/components/popover_confirm_component.js"></script>
   <script src="/scripts/app/controllers/application_controller.js"></script>
+  <script src="/scripts/app/controllers/about_controller.js"></script>
   <script src="/scripts/app/controllers/index_controller.js"></script>
   <script src="/scripts/app/controllers/peer_controller.js"></script>
   <script src="/scripts/app/models/peer.js"></script>
diff --git a/app/scripts/app.js b/app/scripts/app.js
index fee416e..412848b 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -71,14 +71,15 @@ ShareDrop.App.IndexRoute = Ember.Route.extend({
     actions: {
         openModal: function(modalName) {
             return this.render(modalName, {
-                into: 'index',
-                outlet: 'modal'
+                outlet: 'modal',
+                into: 'index'
             });
         },
 
         closeModal: function() {
             return this.disconnectOutlet({
-                outlet: 'modal'
+                outlet: 'modal',
+                parentView: 'index'
             });
         }
     }
diff --git a/app/scripts/app/controllers/about_controller.js b/app/scripts/app/controllers/about_controller.js
new file mode 100644
index 0000000..0ca9722
--- /dev/null
+++ b/app/scripts/app/controllers/about_controller.js
@@ -0,0 +1,7 @@
+ShareDrop.App.AboutController = Ember.Controller.extend({
+  actions: {
+    close: function() {
+      return this.send('closeModal');
+    }
+  }
+});