Index: branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl
===================================================================
diff -u -r5788 -r5820
--- branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 5788)
+++ branches/unlabeled/unlabeled-1.1.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl	(.../item_selector_toolbar.tpl)	(revision 5820)
@@ -7,7 +7,12 @@
 	 	
 	a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
 				<inp2:m_if check="m_ParamEquals" name="is_catalog" value="1">
-					set_hidden_field('selected_ids[c]', Grids['c'].GetSelected());
+					var $category_ids = Grids['c'].GetSelected();
+					if ($category_ids.length == 0) {
+						// no categories selected, then use current category
+						$category_ids = get_hidden_field('m_cat_id');
+					}
+					set_hidden_field('selected_ids[c]', $category_ids);
 					if (Grids[$Catalog.ActivePrefix]) {
 						set_hidden_field('selected_ids[' + $Catalog.ActivePrefix + ']', Grids[$Catalog.ActivePrefix].GetSelected());
 					}