diff --git a/public/js/controllers/filtersCtrl.js b/public/js/controllers/filtersCtrl.js
index 7d4074d751..1f2ca4894f 100644
--- a/public/js/controllers/filtersCtrl.js
+++ b/public/js/controllers/filtersCtrl.js
@@ -20,7 +20,7 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared',
         tagsSnap = _.object(_.pluck(tagsSnap,'id'), tagsSnap);
         $scope._editing = true;
       }
-    }
+    };
 
     $scope.toggleFilter = function(tag) {
       user.filters[tag.id] = !user.filters[tag.id];
@@ -33,4 +33,10 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', 'Shared',
       User.user.ops.addTag({body:{name:name, id:Shared.uuid()}});
       $scope._newTag = '';
     };
+    
+    $scope.checkKeyForSaving = function($event) {
+      if($event.keyCode === 13) {
+        $scope.saveOrEdit();
+      }
+    };
 }]);
diff --git a/views/main/filters.jade b/views/main/filters.jade
index 2752dabb20..3fc5f2ef7d 100644
--- a/views/main/filters.jade
+++ b/views/main/filters.jade
@@ -26,8 +26,8 @@
         ul(ng-if='_editing')
           li.filters-edit(ng-class='{active: user.filters[tag.id]}', ng-repeat='tag in user.tags', bindonce='user.tags')
             form.hrpg-input-group
-              input(type='text', ng-model='tag.name')
-              button(ng-click='user.ops.deleteTag({params:{id:tag.id}})')
+              input(type='text', ng-model='tag.name', ng-keyup='checkKeyForSaving($event)')
+              button(type='button', ng-click='user.ops.deleteTag({params:{id:tag.id}})')
                 span.glyphicon.glyphicon-trash
         ul(ng-if='!_editing', hrpg-sort-tags)
           li.filters-tags(ng-class='{active: user.filters[tag.id], challenge: tag.challenge}', ng-repeat='tag in user.tags', bindonce='user.tags')