diff --git a/frontend/src/components/TopicCard.js b/frontend/src/components/TopicCard.js
index a0f0b8d7..d41b3720 100644
--- a/frontend/src/components/TopicCard.js
+++ b/frontend/src/components/TopicCard.js
@@ -299,6 +299,15 @@ class ReactTopicCard extends Component {
               className="titleWrapper"
               id="titleActivator"
               classEditing="riek-editing"
+              editProps={{
+                onKeyPress: e => {
+                  const ENTER = 13
+                  if (e.which === ENTER) {
+                    e.preventDefault()
+                    this.props.updateTopic({ name: e.target.value })
+                  }
+                }
+              }}
             />
           </span>
           <div className="links">