diff --git a/domain/category/endpoint.go b/domain/category/endpoint.go
index ef54ab40..4c93131b 100644
--- a/domain/category/endpoint.go
+++ b/domain/category/endpoint.go
@@ -279,7 +279,7 @@ func (h *Handler) Delete(w http.ResponseWriter, r *http.Request) {
 }
 
 /*
-	6. add category view permission !!!
 	7. link/unlink document to category
+	6. add category view permission !!!
 	8. filter space documents by category -- URL param? nested route?
 */
diff --git a/gui/app/components/folder/category-admin.js b/gui/app/components/folder/category-admin.js
index aaeb49a9..23d94eab 100644
--- a/gui/app/components/folder/category-admin.js
+++ b/gui/app/components/folder/category-admin.js
@@ -78,10 +78,18 @@ export default Ember.Component.extend(NotifierMixin, {
 
 		onCancel(id) {
 			this.setEdit(id, false);
+			this.load();
 		},
 
 		onSave(id) {
-			let cat = this.setEdit(id, false);
+			let cat = this.setEdit(id, true);
+			if (cat.get('category') === '') {
+				$('#edit-category-' + cat.get('id')).addClass('error').focus();
+				return;
+			}
+
+			cat = this.setEdit(id, false);
+			$('#edit-category-' + cat.get('id')).removeClass('error');
 
 			this.get('categoryService').save(cat).then(() => {
 				this.load();
diff --git a/gui/app/templates/components/folder/category-admin.hbs b/gui/app/templates/components/folder/category-admin.hbs
index 17fb4e49..0faa7f72 100644
--- a/gui/app/templates/components/folder/category-admin.hbs
+++ b/gui/app/templates/components/folder/category-admin.hbs
@@ -41,7 +41,7 @@
 						<div class="margin-top-30"><i>No categories defined yet</i></div>
 					{{/each}}
 				</div>
-				<div class="input-control margin-top-50">
+				<div class="input-control margin-top-50 width-60">
 					<label>Add Category</label>
 					<div class="tip">Provide a short name</div>
 					{{focus-input id="new-category-name" type="text" value=newCategory}}