diff --git a/invesalius/data/surface.py b/invesalius/data/surface.py
index 26dbe48..f87e99a 100644
--- a/invesalius/data/surface.py
+++ b/invesalius/data/surface.py
@@ -361,6 +361,9 @@ class SurfaceManager():
         del self.actors_dict
         self.actors_dict = {}
 
+        # restarting the surface index
+        Surface.general_index = -1
+
     def OnSelectSurface(self, pubsub_evt):
         index = pubsub_evt.data
         #self.last_surface_index = index
diff --git a/invesalius/gui/task_surface.py b/invesalius/gui/task_surface.py
index f105003..fc6ff8f 100644
--- a/invesalius/gui/task_surface.py
+++ b/invesalius/gui/task_surface.py
@@ -501,6 +501,7 @@ class SurfaceProperties(wx.Panel):
         n = self.combo_surface_name.GetCount()
         for i in xrange(n-1, -1, -1):
             self.combo_surface_name.Delete(i)
+        self.surface_list = []
 
     def ChangeSurfaceName(self, pubsub_evt):
         index, name = pubsub_evt.data
--
libgit2 0.21.2