diff --git a/invesalius/gui/task_surface.py b/invesalius/gui/task_surface.py
index d2cd6b2..b0e1cc7 100644
--- a/invesalius/gui/task_surface.py
+++ b/invesalius/gui/task_surface.py
@@ -485,10 +485,11 @@ class SurfaceProperties(wx.Panel):
         s = self.combo_surface_name.GetSelection()
         self.combo_surface_name.SetItems([n[0] for n in self.surface_list])
 
-        if s in list_index:
-            self.combo_surface_name.SetSelection(0)
-        else:
-            self.combo_surface_name.SetSelection(s)
+        if self.surface_list:
+            if s in list_index:
+                self.combo_surface_name.SetSelection(0)
+            else:
+                self.combo_surface_name.SetSelection(s)
 
     def OnCloseProject(self, pubsub_evt):
         self.CloseProject()
--
libgit2 0.21.2