diff --git a/scanner/PhotoAlbum.py b/scanner/PhotoAlbum.py
index aeb3087..babc968 100644
--- a/scanner/PhotoAlbum.py
+++ b/scanner/PhotoAlbum.py
@@ -104,7 +104,7 @@ class Album(object):
 		return None
 	
 class Photo(object):
-	thumb_sizes = [ (75, True), (150, True), (640, False), (800, False), (1024, False) ]
+	thumb_sizes = [ (75, True), (150, True), (640, False), (1024, False), (1600, False) ]
 	def __init__(self, path, thumb_path=None, attributes=None):
 		self._path = trim_base(path)
 		self.is_valid = True
diff --git a/web/js/011-display.js b/web/js/011-display.js
index 062abe1..1f44b07 100644
--- a/web/js/011-display.js
+++ b/web/js/011-display.js
@@ -27,7 +27,7 @@ $(document).ready(function() {
 	var previousPhoto = null;
 	var originalTitle = document.title;
 	var photoFloat = new PhotoFloat();
-	var maxSize = 800;
+	var maxSize = 1024;
 	
 	
 	/* Displays */
@@ -314,7 +314,7 @@ $(document).ready(function() {
 		$("#fullscreen-divider").show();
 		$("#fullscreen").show().click(function() {
 			$("#photo").fullScreen({callback: function(isFullscreen) {
-				maxSize = isFullscreen ? 1024 : 800;
+				maxSize = isFullscreen ? 1600 : 1024;
 				showPhoto();
 			}});
 		});