diff --git a/public/js/gcs/controllers.js b/public/js/gcs/controllers.js
index df99bdc..dd68d39 100644
--- a/public/js/gcs/controllers.js
+++ b/public/js/gcs/controllers.js
@@ -113,7 +113,16 @@ App.IndexController = Ember.ArrayController.extend({
 });
 
 App.DomainController = Ember.ObjectController.extend({
-  selectedAction: null
+  selectedAction: null,
+
+  delete: function() {
+    var domainName = this.get('domain').get('name');
+    var record = App.store.find(App.Domain, domainName);
+    if (record && confirm('Do you really want this domain to be deleted?')) {
+      App.store.deleteRecord(record);
+      App.store.commit();
+    }
+  }
 });
 
 App.DomainShowController = Ember.ObjectController.extend({
diff --git a/public/js/gcs/router.js b/public/js/gcs/router.js
index b6dbaeb..215e3b6 100644
--- a/public/js/gcs/router.js
+++ b/public/js/gcs/router.js
@@ -25,7 +25,6 @@ App.Router = Ember.Router.extend({
     gotoDomainSearch: Ember.State.transitionTo('domains.search'),
     gotoDomainShow: Ember.State.transitionTo('domains.show'),
     gotoDomainCreate: Ember.State.transitionTo('domains.create'),
-    gotoDomainDelete: Ember.State.transitionTo('domains.delete'),
     index: Ember.Route.extend({
       route: '/',
       connectOutlets: function(router) {
@@ -42,7 +41,11 @@ App.Router = Ember.Router.extend({
           this.connectDomainOutlet(router, domain);
           var domainController = router.get('domainController');
           domainController.set('selectedAction', 'About');
+          domainController.set('domain', domain);
           domainController.connectOutlet('domainShow', domain);
+        },
+        delete: function(router) {
+          router.get('domainController').delete();
         }
       }),
       search: Ember.Route.extend(App.WithDomain, {
@@ -71,14 +74,6 @@ App.Router = Ember.Router.extend({
           applicationController.set('selected', ['DomainCreate']);
           applicationController.connectOutlet('domainCreate');
         }
-      }),
-      'delete': Ember.Route.extend({
-        route: 'delete',
-        connectOutlets: function(router) {
-          var applicationController = router.get('applicationController');
-          applicationController.set('selected', ['DomainDelete']);
-          applicationController.connectOutlet('domainDelete');
-        }
       })
     }),
     loading: Em.State.extend({})
diff --git a/public/js/gcs/views.js b/public/js/gcs/views.js
index 38d9a06..b49bf81 100644
--- a/public/js/gcs/views.js
+++ b/public/js/gcs/views.js
@@ -72,22 +72,3 @@ App.DomainCreateView = Ember.View.extend({
     }
   })
 });
-
-App.DomainDeleteView = Ember.View.extend({
-  templateName: 'domain-delete',
-
-  DomainDeleteFormView: Ember.View.extend({
-    tagName: 'form',
-    classNames: 'form-horizontal',
-
-    submit: function(event) {
-      event.preventDefault();
-      var domainName = this.get('controller.domainName');
-      var record = App.store.find(App.Domain, domainName);
-      if (record) {
-        App.store.deleteRecord(record);
-        App.store.commit();
-      }
-    }
-  })
-});
diff --git a/views/index.jade b/views/index.jade
index 347942b..cb5d388 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -39,9 +39,6 @@ html
                 {{#view view.NavItemView section="DomainCreate"}}
                 <a href {{action gotoDomainCreate}}><i class="icon-plus"></i> New domain</a>
                 {{/view}}
-                {{#view view.NavItemView section="DomainDelete"}}
-                <a href {{action gotoDomainDelete}}><i class="icon-remove"></i> Delete domain</a>
-                {{/view}}
           .span10
             {{outlet}}
 
@@ -63,7 +60,7 @@ html
         {{#view view.NavItemView item="Search"}}
         <a href {{action gotoDomainSearch this.content}}>Search</a>
         {{/view}}
-        // <a href {{action gotoDomainDelete}} class="pull-right"><i class="icon-remove"></i> Delete</a>
+        <a href {{action delete}} class="pull-right"><i class="icon-remove"></i> Delete</a>
 
       {{outlet}}
 
@@ -97,19 +94,6 @@ html
           button(type="submit", class="btn btn-primary") Create
       {{/view}}
 
-    script(data-template-name="domain-delete", type="text/x-handlebars")
-      h1 Deleting a domain
-
-      {{#view view.DomainDeleteFormView}}
-      .control-group
-        label.control-label Domain Name
-        .controls
-          {{view Ember.TextField valueBinding="domainName"}}
-      .control-group
-        .controls
-          button(type="submit", class="btn btn-primary") Delete
-      {{/view}}
-
     script(data-template-name="domain-search", type="text/x-handlebars")
       {{#view view.SearchFormView}}
       {{view Ember.TextField valueBinding="query"}}