diff --git a/mod/photos.php b/mod/photos.php
index 866d8c275..f2df894c0 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -635,7 +635,7 @@ function photos_content(&$a) {
 		);
 		if(count($r)) {
 			$a->set_pager_total(count($r));
-			$a->set_pager_itemspage(30);
+			$a->set_pager_itemspage(60);
 		}
 
 		if($_GET['order'] === 'posted')
@@ -753,12 +753,15 @@ function photos_content(&$a) {
 			}
 		}
 		if($_REQUEST['aj']) {
-			if(! $r)
+			if(! $r) {
 				$ajaxout .= '<div id="content-complete"></div>';
+				echo $ajaxout;
+				killme();
+			}
 
 			echo '<div id="photo-album-contents-' . $a->pager['page'] . '">';
 			echo $ajaxout;
-			echo '<div>';
+			echo '</div>';
 			echo '<script>justifyPhotos(' . $a->pager['page'] . ');</script>';
 			killme();
 		}
@@ -1165,7 +1168,7 @@ function photos_content(&$a) {
 	);
 	if(count($r)) {
 		$a->set_pager_total(count($r));
-		$a->set_pager_itemspage(30);
+		$a->set_pager_itemspage(60);
 	}
 
 	$r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`