diff --git a/app/components/add-ssh-key.coffee b/app/components/add-ssh-key.coffee
index 21cdf261..07e4e74e 100644
--- a/app/components/add-ssh-key.coffee
+++ b/app/components/add-ssh-key.coffee
@@ -40,10 +40,10 @@ AddSshKeyComponent = Ember.Component.extend
     error = errArr[0]
     if error.code == 'not_a_private_key'
       this.set('valueError', 'This key is not a private key.')
-    else if error.code == 'key_with_a_passphrase' 
+    else if error.code == 'key_with_a_passphrase'
       this.set('valueError', 'We can\'t use key with a passphrase.')
 
-  actions: 
+  actions:
 
     save: ->
       this.set('valueError', false)
@@ -55,10 +55,12 @@ AddSshKeyComponent = Ember.Component.extend
           description: @get('description')
           value: @get('value')
         )
-        self = this
+
         ssh_key.save().then =>
           @set('isSaving', false)
           @reset()
+
+          @sendAction('sshKeyAdded', ssh_key)
         , (error) =>
           @set('isSaving', false)
           if error.errors
diff --git a/app/controllers/settings.coffee b/app/controllers/settings.coffee
index 9d535b96..0006d2bf 100644
--- a/app/controllers/settings.coffee
+++ b/app/controllers/settings.coffee
@@ -1,7 +1,9 @@
 `import Ember from 'ember'`
 
 SettingsController = Ember.Controller.extend
-
   envVars: Ember.computed.filterBy('model.envVars', 'isNew', false)
 
+  actions:
+    sshKeyAdded: (sshKey) ->
+      @set('model.customSshKey', sshKey)
 `export default SettingsController`
diff --git a/app/templates/settings.hbs b/app/templates/settings.hbs
index 9af9fb47..90ef2770 100644
--- a/app/templates/settings.hbs
+++ b/app/templates/settings.hbs
@@ -35,7 +35,7 @@
       {{ssh-key key=model.customSshKey}}
     {{else}}
       {{ssh-key key=model.sshKey}}
-      {{add-ssh-key repo=repo}}
+      {{add-ssh-key repo=repo sshKeyAdded="sshKeyAdded"}}
     {{/if}}
 
   </section>