diff --git a/CHANGELOG.md b/CHANGELOG.md
index c38b58c9..4d936789 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG for FlatCAM beta
 - updated the Turkish translation files (by Mehmet Kaya)
 - added a new color in the Object Colors ("indigo")
 - now the object color transparency is preserved if a new color is chosen
+- the Proprties tab UI is now populated with the object UI only when the Properties tab is selected and not on object selection like it was done previously
 
 5.10.2021
 
diff --git a/appObjects/ObjectCollection.py b/appObjects/ObjectCollection.py
index d7d9eecf..76c67419 100644
--- a/appObjects/ObjectCollection.py
+++ b/appObjects/ObjectCollection.py
@@ -995,11 +995,11 @@ class ObjectCollection(QtCore.QAbstractItemModel):
             self.app.setup_default_properties_tab()
             return
 
-        if obj:
-            try:
-                obj.build_ui()
-            except RuntimeError:
-                pass
+        # if obj:
+        #     try:
+        #         obj.build_ui()
+        #     except RuntimeError:
+        #         pass
 
         # don't emit the signal if there more than one objects selected
         # this signal is intended to be emitted for a single selection in the collection view
@@ -1016,12 +1016,12 @@ class ObjectCollection(QtCore.QAbstractItemModel):
         a_idx = index.internalPointer().obj
         if a_idx is None:
             return
-        else:
-            try:
-                a_idx.build_ui()
-            except Exception as e:
-                self.app.inform.emit('[ERROR] %s: %s' % (_("Cause of error"), str(e)))
-                raise
+
+        try:
+            a_idx.build_ui()
+        except Exception as e:
+            self.app.inform.emit('[ERROR] %s: %s' % (_("Cause of error"), str(e)))
+            raise
 
     def get_list(self):
         """
diff --git a/app_Main.py b/app_Main.py
index 0c80a367..132e4e6f 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -1432,7 +1432,8 @@ class App(QtCore.QObject):
         self.connect_canvas_context_signals()
 
         # Notebook tab clicking
-        self.ui.notebook.tabBarClicked.connect(self.on_properties_tab_click)
+        # self.ui.notebook.tabBarClicked.connect(self.on_properties_tab_click)
+        self.ui.notebook.currentChanged.connect(self.on_notebook_tab_changed)
 
         # self.ui.notebook.callback_on_close = self.on_close_notebook_tab
 
@@ -6704,7 +6705,7 @@ class App(QtCore.QObject):
 
     def on_notebook_closed(self, tab_obj_name):
 
-        closed_plugin_name = self.ui.plugin_scroll_area.widget().objectName()
+        # closed_plugin_name = self.ui.plugin_scroll_area.widget().objectName()
         # # print(closed_plugin_name)
         # if closed_plugin_name == _("Levelling"):
         #     # clear the possible drawn probing shapes
@@ -6712,7 +6713,7 @@ class App(QtCore.QObject):
         # elif closed_plugin_name in [_("Isolation"), _("NCC"), _("Paint"), _("Punch Gerber")]:
         #     self.tool_shapes.clear(update=True)
 
-        disconnected_tool = self.ui.plugin_scroll_area.widget()
+        # disconnected_tool = self.ui.plugin_scroll_area.widget()
 
         # try:
         #     # if the closed plugin name is Milling
@@ -8358,31 +8359,25 @@ class App(QtCore.QObject):
         if tab_wdg and tab_wdg.objectName() == 'default_properties':
             self.setup_default_properties_tab()
 
+    def on_notebook_tab_changed(self):
+        """
+        Slot for current tab changed in self.ui.notebook
+
+        :return:
+        """
+        if self.ui.notebook.tabText(self.ui.notebook.currentIndex()) == _("Properties"):
+            active_obj = self.collection.get_active()
+            if active_obj:
+                active_obj.build_ui()
+            else:
+                self.setup_default_properties_tab()
+
     def setup_default_properties_tab(self):
         """
         Default text for the Properties tab when is not taken by the Object UI.
 
         :return:
         """
-        # label = FCLabel("Choose an item from Project")
-        # label.setAlignment(QtCore.Qt.AlignHCenter | QtCore.Qt.AlignVCenter)
-
-        # sel_title = QtWidgets.QTextEdit()
-        # sel_title.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
-        # sel_title.setFrameStyle(QtWidgets.QFrame.Shape.NoFrame)
-        #
-        # f_settings = QSettings("Open Source", "FlatCAM")
-        # if f_settings.contains("notebook_font_size"):
-        #     fsize = f_settings.value('notebook_font_size', type=int)
-        # else:
-        #     fsize = 12
-        #
-        # tsize = fsize + int(fsize / 2)
-        #
-        # selected_text = ''
-        #
-        # sel_title.setText(selected_text)
-        # sel_title.setSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Expanding)
 
         # Tree Widget
         d_properties_tw = FCTree(columns=2)