diff --git a/vendor/built_in_modules/feed/app/controllers/panel/feed/back_end/feeds_controller.rb b/vendor/built_in_modules/feed/app/controllers/panel/feed/back_end/feeds_controller.rb
index 9448960fd..9a90bbef5 100644
--- a/vendor/built_in_modules/feed/app/controllers/panel/feed/back_end/feeds_controller.rb
+++ b/vendor/built_in_modules/feed/app/controllers/panel/feed/back_end/feeds_controller.rb
@@ -12,12 +12,11 @@ class Panel::Feed::BackEnd::FeedsController < OrbitBackendController
 
   def new
     @feed = AnnouncementFeed.new
-    @categories = BulletinCategory.all
   end
 
   def edit
     @feed = AnnouncementFeed.find(params[:id])
-    @categories = BulletinCategory.all
+    @categories = @feed.categories
   end
 
   def create
diff --git a/vendor/built_in_modules/feed/app/views/panel/feed/back_end/feeds/edit.html.erb b/vendor/built_in_modules/feed/app/views/panel/feed/back_end/feeds/edit.html.erb
index 6da95d308..35dc68b89 100644
--- a/vendor/built_in_modules/feed/app/views/panel/feed/back_end/feeds/edit.html.erb
+++ b/vendor/built_in_modules/feed/app/views/panel/feed/back_end/feeds/edit.html.erb
@@ -1,3 +1,30 @@
 <%= form_for @feed, :url => panel_feed_back_end_feed_path, :method => :put, :html => {:class => "form-horizontal"} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f}  %>
-<% end  %>
\ No newline at end of file
+<% end  %>
+<script type="text/javascript">
+
+var checkboxes = $('.checkbox input');
+
+$(document).ready(function() {
+  var categories = <%= @categories.to_json.html_safe %>;
+
+  for (var i = 0; i < checkboxes.length; i++) {
+
+    if ($.inArray(checkboxes[i].value, categories) != -1) {
+      checkboxes[i].checked = true;
+    } else {
+      continue;
+    }
+  }
+
+});
+
+checkboxes.on('click', function() {
+  if (checkboxes[0].checked == true) {
+    for (var i = 1; i < checkboxes.length; i++) {
+      checkboxes[i].checked = false;
+    }
+  }
+});
+
+</script>
\ No newline at end of file