diff --git a/src/gui/DamarisGUI.py b/src/gui/DamarisGUI.py
index 46e2946..8228a20 100644
--- a/src/gui/DamarisGUI.py
+++ b/src/gui/DamarisGUI.py
@@ -472,7 +472,16 @@ class DamarisGUI:
             loop_run += interval
             
             if self.stop_experiment_flag.isSet():
+                #Experiment has been stopped, clean up and leave
                 self.experiment_script_statusbar_label.set_text("Experiment stopped")
+                self.state = DamarisGUI.Edit_State
+                self.sw.enable_editing( )
+                self.toolbar_run_button.set_sensitive( True )
+                self.toolbar_stop_button.set_sensitive( False )
+                self.toolbar_pause_button.set_sensitive( False )
+                self.toolbar_pause_button.set_active( False )
+                #delete experiment from queue so that next experiment may start
+                self.lockfile.del_experiment(self.id)
                 return
 
         # start experiment
@@ -519,6 +528,8 @@ class DamarisGUI:
             self.toolbar_stop_button.set_sensitive( False )
             self.toolbar_pause_button.set_sensitive( False )
             self.toolbar_pause_button.set_active( False )
+            #delete Experiment from queue
+            self.lockfile.del_experiment(self.id)
             return
 
         # switch to grapics