diff --git a/src/EditPerson.py b/src/EditPerson.py
index 304b082d5..898ed2784 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -1487,7 +1487,6 @@ class EditPerson:
             self.redraw_event_list()
         elif page == 6 and self.not_loaded:
             self.not_loaded = 0
-            self.gallery.load_images()
         elif page == 8 and self.lds_not_loaded:
             self.lds_not_loaded = 0
             self.draw_lds()
diff --git a/src/ImageSelect.py b/src/ImageSelect.py
index fc9586b38..69e473eda 100644
--- a/src/ImageSelect.py
+++ b/src/ImageSelect.py
@@ -339,7 +339,7 @@ class Gallery(ImageSelect):
         """Scale the image and add it to the IconList."""
         object = photo.getReference()
         oid = object.getId()
-        
+
         if self.canvas_list.has_key(oid):
             (grp,item,text,x,y) = self.canvas_list[oid]
             if x != self.cx or y != self.cy:
@@ -387,11 +387,11 @@ class Gallery(ImageSelect):
             
         self.canvas_list[oid] = (grp,item,text,self.cx,self.cy)
 
+        self.cx += _PAD + _IMAGEX
+        
         if self.cx + _PAD + _IMAGEX > self.x:
             self.cx = _PAD
-            self.cy = self.cy + _PAD + _IMAGEY
-        else:
-            self.cx = self.cx + _PAD + _IMAGEX
+            self.cy += _PAD + _IMAGEY
         
     def load_images(self):
         """clears the currentImages list to free up any cached