diff --git a/pandaapp/src/indexify/indexImage.cxx b/pandaapp/src/indexify/indexImage.cxx
index e35b406f15..8431186319 100644
--- a/pandaapp/src/indexify/indexImage.cxx
+++ b/pandaapp/src/indexify/indexImage.cxx
@@ -68,7 +68,7 @@ add_photo(int photo_index) {
   int xi = count - (yi * thumb_count_x);
 
   int x = thumb_x_space + xi * (thumb_width + thumb_x_space);
-  int y = thumb_y_space + yi * (thumb_width + thumb_caption_height + thumb_x_space);
+  int y = thumb_y_space + yi * (thumb_height + thumb_caption_height + thumb_y_space);
 
   PhotoInfo pinfo;
   pinfo._photo_index = photo_index;
diff --git a/pandaapp/src/indexify/indexParameters.h b/pandaapp/src/indexify/indexParameters.h
index 1569e365f6..1d51936d39 100644
--- a/pandaapp/src/indexify/indexParameters.h
+++ b/pandaapp/src/indexify/indexParameters.h
@@ -34,7 +34,7 @@
 // row).  It will never be larger than this.
 extern int max_index_size_array[2];
 #define max_index_width (max_index_size_array[0])
-#define max_index_height (max_index_size_array[0])
+#define max_index_height (max_index_size_array[1])
 
 // The size of the individual thumbnail images, including the frames
 // (if present).  Thumbnail images are scaled to fit within this box.