diff --git a/vendor/built_in_modules/gallery/app/assets/images/gallery/ajax-loader.gif b/vendor/built_in_modules/gallery/app/assets/images/gallery/ajax-loader.gif
new file mode 100644
index 000000000..de2e8b6cd
Binary files /dev/null and b/vendor/built_in_modules/gallery/app/assets/images/gallery/ajax-loader.gif differ
diff --git a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb
index 782a0c757..440ca6f90 100644
--- a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb
+++ b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI_frontend.js.erb
@@ -12,11 +12,21 @@ var galleryAPI = function(){
 	this.tagList = $(".taglist ul");
 	// this.authenticated = false;
 	this.initialize = function(callbackFn){
-		$(document).ready(function(){
-			//bindHandlers();
-		})
-		var bindHandlers = function(){
-			
+		if(g.loadArea == "theater"){
+			if(rcom.getInternetExplorerVersion()!=-1){
+				var photo_id = window.location.hash.replace("#","");
+				var params = rcom.getUrlVars();
+				var url = window.location.href.split("?")[0];
+				params["id"] = photo_id;
+				for(i=0;i<params.length;i++){
+    				if(i == 0)
+    					url+="?"+params[i]+"="+params[params[i]];
+    				else
+    					url+="&"+params[i]+"="+params[params[i]];
+
+				}
+				window.location.href = url;
+			}
 		}
 	}
 	
@@ -198,9 +208,13 @@ var galleryAPI = function(){
 
 				$img.fadeOut(200,function(){
 					if($rslide.hasClass("fullscreen"))
-						$img.attr({"src":dom.attr("data-content")}).css("height","100%");
+						$img.attr({"src":dom.attr("data-content")}).css("height","100%").load(function(){
+
+						});
 					else
-						$img.attr({"src":dom.attr("data-content")}).css("height","auto");
+						$img.attr({"src":dom.attr("data-content")}).css("height","auto").load(function(){
+
+						});
 					$img.fadeIn(200);
 	 				if($rslide.hasClass("fullscreen")){
 	 					$img.css({"padding":($rslide.height()-$img.height())/2})
@@ -254,7 +268,8 @@ var galleryAPI = function(){
 				bindHandlers();
 			})
 		}
-		if(rcom.getInternetExplorerVersion()!=-1){
+		var url_constructor = function(){
+			if(rcom.getInternetExplorerVersion()!=-1){
 		 	var url_constructor = window.location.href.split("/");
 			var url = "";
 			for(x=0;x<=url_constructor.length-1;x++){
@@ -264,10 +279,12 @@ var galleryAPI = function(){
 			   		url+=url_constructor[x]+"/";
 			   	}
 			 }
-			 
-			 window.location.href = url;
+			 return url;
+			 // window.location.href = url;
+			}
 		}
 		
+		
 		var albumid = $("#main_pic").attr("data-content");
 		g.albumArea.css("margin-bottom","0");
 		// picHeight = $(window).height() - ($("#orbit-bar").outerHeight() + $("#orbit_gallery .form-actions").outerHeight());
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 dc1a38f6e..e1f64b6a8 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
@@ -56,8 +56,9 @@
 <script type="text/javascript">
   galleryAPI.prototype.locale = "<%= I18n.locale %>";
     	var gallery = new galleryAPI();
+      gallery.loadArea = "theater";
     	gallery.initialize();
-    	gallery.loadArea = "theater";
+    	
     	gallery.loadTheater("<%= params[:id] %>");
 </script>