             creation_date : Date.now()
             creator_id    : @props.account_id
 
-        @cancel_and_close() if @props.toggleable
+        @cancel_and_close()
+
+    key_down: (e) ->
+        if e.keyCode == 13 # Enter key
+            e.preventDefault()
+            @submit_form()
 
     render_panel: ->
         <Panel header={<h2> <Icon name='plus-circle' /> Add an SSH Key</h2>} style={@props.style}>
             {# TODO: Make a style mapper to the components if necessary}
-            <form>
+            <form onSubmit={@submit_form}>
                 <FormGroup>
                     Title
                     <FormControl

                        value = {@state.key_title}
                        onChange = {(e) => @setState(key_title : e.target.value)}
                     />
                </FormGroup>

                <FormGroup>
                    Key
                    <FormControl
                        componentClass = "textarea"

    clear_error: ->
        @setState(error : undefined)

    submit_form: (e) ->
        e?.preventDefault()
        validated_key = validate_key(normalize_key(@state.key_value))
        if validated_key.error?
            @trigger_error(validated_key.error)
