diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57d90c07..1f8f5397 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+4.08.2021
+
+- toggling the plot is now deleting the selection shape, if any
+
 23.07.2021
 
 - fixed errors in the Roland preprocessors
diff --git a/app_Main.py b/app_Main.py
index c731d9d9..86fab09a 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -6960,7 +6960,7 @@ class App(QtCore.QObject):
 
         self.on_zoom_fit()
         self.collection.update_view()
-        # self.inform.emit(_("Plots updated ..."))
+        # self.inform.emit(_("Done."))
 
     def on_toolbar_replot(self):
         """
@@ -8629,12 +8629,16 @@ class App(QtCore.QObject):
             return
 
         self.log.debug("Toggling plots ...")
-        self.inform.emit('%s...' % _("Working"))
+        # self.inform.emit('%s...' % _("Working"))
         for obj in objects:
             if obj.options['plot'] is False:
                 obj.options['plot'] = True
             else:
                 obj.options['plot'] = False
+        try:
+            self.delete_selection_shape()
+        except Exception:
+            pass
         self.app_obj.plots_updated.emit()
 
     def clear_plots(self):