diff --git a/app/controllers/admin/page_parts_controller.rb b/app/controllers/admin/page_parts_controller.rb
index a6e3314f2..bb759403b 100644
--- a/app/controllers/admin/page_parts_controller.rb
+++ b/app/controllers/admin/page_parts_controller.rb
@@ -26,7 +26,12 @@ class Admin::PagePartsController < ApplicationController
     @module_app = @part.module_app ? @part.module_app : @module_apps[0]
     @r_tag = @part.public_r_tag.blank? ? LIST[:public_r_tags][0] : @part.public_r_tag
     @tag_objects = @r_tag.classify.constantize.all
-    @categories =  BulletinCategory.all
+      case @module_app.key
+        when 'bulletin'
+          @categories =  BulletinCategory.all
+        when 'web_resource'
+          @categories =  WebLinkCategory.all
+      end
   end
 
   def create
@@ -59,6 +64,12 @@ class Admin::PagePartsController < ApplicationController
   
   def reload_widgets
     @module_app = ModuleApp.find(params[:id])
+    case @module_app.key
+      when 'announcement'
+        @categories =  BulletinCategory.all
+      when 'web_resource'
+        @categories =  WebLinkCategory.all
+    end
     respond_to do |format|
       format.js  {}
     end
diff --git a/app/views/admin/page_parts/_module_widget.html.erb b/app/views/admin/page_parts/_module_widget.html.erb
index fd481172a..374242df0 100644
--- a/app/views/admin/page_parts/_module_widget.html.erb
+++ b/app/views/admin/page_parts/_module_widget.html.erb
@@ -8,5 +8,5 @@
 
 
 <span id="widget_category">
-	<%= select 'page_part', 'category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @part[:category] %>
+	<%= render 'widget_categories' %>
 </span>
\ No newline at end of file
diff --git a/app/views/admin/page_parts/_widget_categories.html.erb b/app/views/admin/page_parts/_widget_categories.html.erb
new file mode 100644
index 000000000..ce037d395
--- /dev/null
+++ b/app/views/admin/page_parts/_widget_categories.html.erb
@@ -0,0 +1 @@
+	<%= select 'page_part', 'category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => (@part ? @part[:category] : nil) if @categories && @categories.size > 0 %>
\ No newline at end of file
diff --git a/app/views/admin/page_parts/reload_widgets.js.erb b/app/views/admin/page_parts/reload_widgets.js.erb
index 646d4274b..67e7589d9 100644
--- a/app/views/admin/page_parts/reload_widgets.js.erb
+++ b/app/views/admin/page_parts/reload_widgets.js.erb
@@ -1 +1,2 @@
-$('#widget_list select').html("<%= j options_for_select(@module_app.widgets.collect{|widget| [widget.humanize, widget]}) %>")
\ No newline at end of file
+$('#widget_list select').html("<%= j options_for_select(@module_app.widgets.collect{|widget| [widget.humanize, widget]}) %>")
+$('#widget_category').html("<%= j render 'widget_categories' %>")
\ No newline at end of file