diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 8b4da53a2..55f31c1bd 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -123,14 +123,11 @@ class AddCards(QDialog):
         if oldNote:
             if not keep:
                 self.removeTempNote(oldNote)
-            for n in range(len(note.fields)):
-                try:
-                    if not keep or flds[n]["sticky"]:
-                        note.fields[n] = oldNote.fields[n]
-                    else:
-                        note.fields[n] = ""
-                except IndexError:
-                    break
+            for n in range(len(min(note.fields, oldNote.fields))):
+                if not keep or flds[n]["sticky"]:
+                    note.fields[n] = oldNote.fields[n]
+                else:
+                    note.fields[n] = ""
         self.setAndFocusNote(note)
 
     def removeTempNote(self, note: Note) -> None: