diff --git a/browser/index.js b/browser/index.js
index 02af4f6..f964892 100644
--- a/browser/index.js
+++ b/browser/index.js
@@ -180,8 +180,8 @@
       addingTag: false
     };
   },
-  componentDidUpdate: function() {
-    if (this.state.addingTag) {
+  componentDidUpdate: function(prevProps, prevState) {
+    if (this.state.addingTag && !prevState.addingTag) {
       activateInput(this.getDOMNode().querySelector('#edittag-input'));
     }
   },
@@ -233,8 +233,8 @@
       editingText: false
     };
   },
-  componentDidUpdate: function() {
-    if (this.state.editingText) {
+  componentDidUpdate: function(prevProps, prevState) {
+    if (this.state.editingText && !prevState.editingText) {
       activateInput(this.getDOMNode().querySelector('#todo-input'));
     }
   },
@@ -329,8 +329,8 @@
       editingName: false
     };
   },
-  componentDidUpdate: function() {
-    if (this.state.editingName) {
+  componentDidUpdate: function(prevProps, prevState) {
+    if (this.state.editingName && !prevState.editingName) {
       activateInput(this.getDOMNode().querySelector('#list-name-input'));
     }
   },