diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3994c494..e8c13743 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG for FlatCAM beta
 - in Extract Plugin some minor UI changes
 - in Film Plugin added new parameters and improvements: now the negative film can have a box that is convex and it is no longer limited to square shapes. Also, if the box object has only one geometric element (an outline) then that one will be the final shape of the negative
 - in Gerber Editor fixed not being able to delete an aperture
+- in Gerber Editor fixed the edge case where the user selects apertures in the Tools Table and then uses the Poligonize Tool and not by selecting shapes on canvas
 
 21.09.2021
 
diff --git a/appEditors/AppGerberEditor.py b/appEditors/AppGerberEditor.py
index 2a6652a3..6efa26f9 100644
--- a/appEditors/AppGerberEditor.py
+++ b/appEditors/AppGerberEditor.py
@@ -907,7 +907,7 @@ class PoligonizeEditorGrb(ShapeToolEditorGrb):
 
         current_storage = self.draw_app.storage_dict[self.draw_app.last_aperture_selected]['geometry']
         if isinstance(fused_geo, MultiPolygon):
-            for geo in fused_geo:
+            for geo in fused_geo.geoms:
                 # clean-up the geo
                 geo = geo.buffer(0)
 
@@ -3727,7 +3727,7 @@ class AppGerberEditor(QtCore.QObject):
 
     def on_aperture_add(self, apcode=None):
         self.is_modified = True
-        if apcode:
+        if apcode is not None:
             ap_code = apcode
         else:
             try:
@@ -3736,7 +3736,7 @@ class AppGerberEditor(QtCore.QObject):
                 self.app.inform.emit('[WARNING_NOTCL] %s' %
                                      _("Aperture code value is missing or wrong format. Add it and retry."))
                 return
-            if ap_code == '':
+            if ap_code == '' or ap_code is None:
                 self.app.inform.emit('[WARNING_NOTCL] %s' %
                                      _("Aperture code value is missing or wrong format. Add it and retry."))
                 return
@@ -3879,7 +3879,7 @@ class AppGerberEditor(QtCore.QObject):
                 self.on_aperture_add(10)
                 self.last_aperture_selected = 10
             else:
-                self.last_aperture_selected = self.ui.apertures_table.item(0, 1).text()
+                self.last_aperture_selected = int(self.ui.apertures_table.item(0, 1).text())
 
     def on_tool_edit(self):
         if self.ui.apertures_table.currentItem() is None:
@@ -4238,7 +4238,7 @@ class AppGerberEditor(QtCore.QObject):
 
     def on_aptype_changed(self, current_index):
         # 'O' is letter O not zero.
-        print(current_index)
+        # print(current_index)
         if current_index == 1 or current_index == 2:    # 1 == 'R' and 2 == 'O'
             self.ui.apdim_lbl.setDisabled(False)
             self.ui.apdim_entry.setDisabled(False)