diff --git a/mozilla/calendar/lightning/content/lightning-preferences.js b/mozilla/calendar/lightning/content/lightning-preferences.js
index 4d4b8dd322d..ae5d09a9617 100644
--- a/mozilla/calendar/lightning/content/lightning-preferences.js
+++ b/mozilla/calendar/lightning/content/lightning-preferences.js
@@ -43,14 +43,18 @@ var gLightningPane = {
         var timezones = icsService.timezoneIds;
 
         prefValue = document.getElementById("calendar.timezone.local").value;
+        var itemToSelect;
         while (timezones.hasMore()) {
             var tzid = timezones.getNext();
             var listItem = tzListBox.appendItem(tzid, tzid);
             if (tzid == prefValue) {
-                tzListBox.selectItem(listItem);
-                tzListBox.scrollToIndex(tzListBox.getIndexOfItem(listItem));
+                itemToSelect = listItem;
             }
         }
+        if (itemToSelect) {
+            tzListBox.scrollToIndex(tzListBox.getIndexOfItem(itemToSelect));
+            tzListBox.selectItem(itemToSelect);
+        }
     },
 
     getTimezoneResult: function() {