diff --git a/app/controllers/galleries_controller.rb b/app/controllers/galleries_controller.rb
index 0951ef9..c9110ca 100644
--- a/app/controllers/galleries_controller.rb
+++ b/app/controllers/galleries_controller.rb
@@ -1,6 +1,6 @@
 class GalleriesController < ApplicationController
 	def index
-      albums = Album.filter_by_categories.asc(:order)
+      albums = Album.filter_by_categories.filter_by_tags.asc(:order)
       galleries = albums.collect do |a|
       alt_text = (a.description.nil? || a.description == "" ? "gallery image" : a.description)
       {
@@ -38,7 +38,8 @@ class GalleriesController < ApplicationController
   end
 
   def widget
-    albums = Album.filter_by_widget_categories
+    tags = OrbitHelper.widget_tags.empty? ? ["all"] : OrbitHelper.widget_tags
+    albums = Album.filter_by_widget_categories.filter_by_tags(tags)
     params = OrbitHelper.params
     counts = OrbitHelper.widget_data_count