diff --git a/ui/index.html b/ui/index.html
index b9db4de0f9..f0cd715175 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -210,6 +210,7 @@
                   {{ textarea value=model.valueDecoded class="form-control"}}
                 </div>
                 <button {{ action "updateKey"}} {{bind-attr disabled=isLoading }} {{ bind-attr class=":btn isLoading:btn-warning:btn-success" }}>Update</button>
+                <button {{ action "cancelEdit"}} {{bind-attr disabled=isLoading }} {{ bind-attr class=":btn isLoading:btn-warning:btn-default" }}>Cancel</button>
                 <button {{ action "deleteKey"}} {{bind-attr disabled=isLoading }} {{ bind-attr class=":btn :pull-right isLoading:btn-warning:btn-danger" }}>Delete</button>
               </form>
             </div>
diff --git a/ui/javascripts/app/controllers.js b/ui/javascripts/app/controllers.js
index 1fd78ba853..29b4910e2c 100644
--- a/ui/javascripts/app/controllers.js
+++ b/ui/javascripts/app/controllers.js
@@ -143,6 +143,12 @@ App.KvEditController = Ember.Controller.extend({
       })
     },
 
+    cancelEdit: function() {
+      this.set('isLoading', true);
+      this.transitionToRoute('kv.show', this.get("model").get('parentKey'));
+      this.set('isLoading', false);
+    },
+
     deleteKey: function() {
       this.set('isLoading', true);
       var key = this.get("model");