diff --git a/app/assets/javascripts/discourse/views/modal/edit_category_view.js b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
index f1b72330f..4990279fe 100644
--- a/app/assets/javascripts/discourse/views/modal/edit_category_view.js
+++ b/app/assets/javascripts/discourse/views/modal/edit_category_view.js
@@ -57,8 +57,8 @@ Discourse.EditCategoryView = Discourse.ModalBodyView.extend({
 
   buttonTitle: function() {
     if (this.get('saving')) return Em.String.i18n("saving");
-    return this.get('title');
-  }.property('title', 'saving'),
+    return (this.get('category.id') ? Em.String.i18n("category.save") : Em.String.i18n("category.create"));
+  }.property('saving', 'category.id'),
 
   deleteButtonTitle: function() {
     return Em.String.i18n('category.delete');
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 425b7e6b3..e0b6b91d9 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -690,6 +690,7 @@ en:
       view: 'View Topics in Category'
       delete: 'Delete Category'
       create: 'Create Category'
+      save: 'Save Category'
       creation_error: There has been an error during the creation of the category.
       more_posts: "view all {{posts}}..."
       name: "Category Name"