diff --git a/CHANGELOG.md b/CHANGELOG.md
index 113bf1ab7..86671c9cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fixed bug where MetaMask interfered with PDF loading.
 - Moved switch account icon into menu bar.
+- Now enforce 30 character limit on wallet names.
 
 ## 2.4.4 2016-06-23
 
diff --git a/ui/app/components/editable-label.js b/ui/app/components/editable-label.js
index 3d7ca17d4..6b3e8cb28 100644
--- a/ui/app/components/editable-label.js
+++ b/ui/app/components/editable-label.js
@@ -18,6 +18,7 @@ EditableLabel.prototype.render = function () {
     return h('div.editable-label', [
       h('input.sizing-input', {
         defaultValue: props.textValue,
+        maxLength: "30",
         onKeyPress: (event) => {
           this.saveIfEnter(event)
         },