diff --git a/pwaateditor.py b/pwaateditor.py
index 8c7891e..ce5c050 100644
--- a/pwaateditor.py
+++ b/pwaateditor.py
@@ -377,6 +377,8 @@ def createWindow(self, window, tab):
                     
                     textList = self.textList[i]
                     comboBox = Combobox(frame, values=textList, state=state)
+                    if self.values[i] >= len(textList):
+                        self.values[i] = 0
                     comboBox.set(textList[self.values[i]])
                     comboBox.grid(row=(y*2)+1, column=x, padx=padx)
                     self.comboBoxes.append(comboBox)