diff --git a/app/controllers/admin/galleries_controller.rb b/app/controllers/admin/galleries_controller.rb
index f72f7ea..002597a 100644
--- a/app/controllers/admin/galleries_controller.rb
+++ b/app/controllers/admin/galleries_controller.rb
@@ -192,7 +192,7 @@ class Admin::GalleriesController < OrbitAdminController
     end
     update_children_image_tag(tagsToDestroy,tagsToAdd)
     @album.update_attributes(album_params)
-    redirect_to admin_gallery_path(@album)
+    redirect_to "/admin/galleries/"+@album.id.to_s
   end
 
   def update_children_image_tag(tagsToDestroy,tagsToAdd)
diff --git a/app/controllers/galleries_controller.rb b/app/controllers/galleries_controller.rb
index c5f4d15..e609f0a 100644
--- a/app/controllers/galleries_controller.rb
+++ b/app/controllers/galleries_controller.rb
@@ -32,9 +32,9 @@ class GalleriesController < ApplicationController
   def widget
     albums = Album.filter_by_widget_categories
     params = OrbitHelper.params
-
+    
     images = []
-    while images.count < 9
+    while images.count < 9 and images.count < AlbumImage.count
       albums.each do |album|
         img = album.album_images.sample
         if !images.include?(img) && img != nil