diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index 706e6626..999dece4 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -176,6 +176,9 @@ module.controller('FeedDetailsCtrl', ['$scope', '$state', '$stateParams', 'FeedS
 	
 	$scope.sub = FeedService.get({
 		id : $stateParams._id
+	}, function(data) {
+		if (!data.categoryId)
+			data.categoryId = 'all';
 	});
 	
 	$scope.back = function() {
@@ -240,6 +243,12 @@ module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'F
 		return parseInt($stateParams._id, 10) != $stateParams._id;
 	};
 	
+    $scope.filterCurrent = function(elem) { 
+    	if (!$scope.category) 
+    		return true;
+    	return elem.id != $scope.category.id;
+    }; 
+	
 	CategoryService.get(function() {
 		if ($scope.isMeta()) {
 			$scope.category = {
@@ -259,6 +268,8 @@ module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'F
 				break;
 			}
 		}
+		if (!$scope.category.parentId)
+			$scope.category.parentId = 'all';
 	});
 	
 	$scope.back = function() {
diff --git a/src/main/webapp/templates/feeds.category_details.html b/src/main/webapp/templates/feeds.category_details.html
index ad637882..a0795518 100644
--- a/src/main/webapp/templates/feeds.category_details.html
+++ b/src/main/webapp/templates/feeds.category_details.html
@@ -15,7 +15,7 @@
 			<label class="control-label">Parent category</label>
 			<div class="controls">
 				<select name="category" class="input-block-level" ng-model="category.parentId" 
-					ng-options="cat.id as cat.name for cat in CategoryService.flatCategories">
+					ng-options="cat.id as cat.name for cat in CategoryService.flatCategories | filter: filterCurrent">
 				</select>
 				<span class="help-block" ng-show="!form.category.$valid">Required</span>
 			</div>