diff --git a/apps/gallery/js/album_cover.js b/apps/gallery/js/album_cover.js
index 61084c99b29b921697d4e1db38c8af23f881ddcc..d1809462f2f513307dabe697fbb43f208e9d2948 100644
--- a/apps/gallery/js/album_cover.js
+++ b/apps/gallery/js/album_cover.js
@@ -86,18 +86,16 @@ function albumClickHandler(r) {
       Albums.recursive = false;
       Albums.token = '';
     }
-		var targetDiv = document.getElementById('gallery_list');
-		if (targetDiv) {
-			$(targetDiv).html('');
+		$(document).ready(function(){
+			var targetDiv = $('#gallery_list');
+			targetDiv.html('');
 			Albums.display(targetDiv);
 			//$('#gallery_list').sortable({revert:true});
 			$('.album').each(function(i, el) {
 				$(el).click(albumClick.bind(null,$(el).attr('title')));
 				//$(el).draggable({connectToSortable: '#gallery_list', handle: '.dummy'});
 			});
-		} else {
-			OC.dialogs.alert(t('gallery', 'Error: no such layer `gallery_list`'), t('gallery', 'Internal error'));
-		}
+		});
 	} else {
 		OC.dialogs.alert(t('gallery', 'Error: ') + r.cause, t('gallery', 'Internal error'));
 	}
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 1fb38a5546cf4efaab90709724fe07eded1f622c..35537aa54c2436fab5772d6fa8fad6c50ff48956 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -77,11 +77,11 @@ Albums={
         if (x < 0 ||  isNaN(x)) x=0;
 				$(this).css('background-position', -x+'px 0');
 			});
-			$(element).append(local);
+			element.append(local);
 		}
 		var photoDisplayTemplate = '<div class="gallery_box"><div class="dummy"></div><div><a rel="images" href="'+OC.linkTo('files','download.php')+'?file=URLPATH"><img src="'+OC.filePath('gallery','ajax','thumbnail.php')+'?img=IMGPATH"></a></div></div>';
 		for (var i in Albums.photos) {
-			$(element).append(photoDisplayTemplate.replace("IMGPATH", escape(Albums.photos[i])).replace("URLPATH", escape(Albums.photos[i])));
+			element.append(photoDisplayTemplate.replace("IMGPATH", escape(Albums.photos[i])).replace("URLPATH", escape(Albums.photos[i])));
 		}
 		$("a[rel=images]").fancybox({
 			'titlePosition': 'inside'