diff --git a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb
index b39c1fa52..51ba47cb3 100644
--- a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb
+++ b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/front_end/albums_controller.rb
@@ -10,6 +10,7 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
 		@album.tag_ids.each do |tag|
 			@tags << GalleryTag.find(tag)[I18n.locale]
 		end
+
 	end
 
 	def get_albums
@@ -96,6 +97,7 @@ class Panel::Gallery::FrontEnd::AlbumsController < OrbitWidgetController
 		tags.each do |tag|
 			@tagnames << GalleryTag.find(tag)[I18n.locale]
 		end
+		@back_link = panel_gallery_front_end_album_path(@albumid)
 	end
 
 
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb
index caeaf74af..7f7ce0ef8 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/index.html.erb
@@ -36,7 +36,7 @@
         gallery.loadAlbums(gallery.urlVars['tag']);
     }else{
       gallery.loadArea = "albums";
-      g.loadAlbums("all");
+      gallery.loadAlbums("all");
     }
 </script>
 
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb
index c0d7fb1f4..10520358f 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/show.html.erb
@@ -20,7 +20,7 @@
   <!-- tag end -->
   <div class="form-actions form-fixed pagination-right rghead">
     <div class="rgfn">
-   		<a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="gallery"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a>
+   		<a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="<%= panel_gallery_front_end_albums_path %>"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a>
   </div>
 </div>
 </div>
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb
index 58137ea55..dc1a38f6e 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/albums/theater.html.erb
@@ -42,7 +42,7 @@
   <!-- tag end -->
   <div class="form-actions form-fixed pagination-right rghead">
   <div class="rgfn">
-    <a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="gallery?id=<%= @albumid %>"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a>
+    <a class="bt-back rgbt" title="<%= I18n.t("gallery.back_to_albums") %>" href="<%= @back_link %>"><i class="icon-arrow-left"></i> <%= I18n.t("gallery.back_to_albums") %></a>
   </div>
 </div>
 </div>