diff --git a/plugin.py b/plugin.py
index a317a67..8a0e1ce 100644
--- a/plugin.py
+++ b/plugin.py
@@ -346,7 +346,6 @@ def manage_beacons(self):
             self.set_database_connection()
             if self.database is None:
                 return
-        self.refresh_layers()
         BeaconManager(self.iface, self.database, self.required_layers)
         validate_plugin_actions(self, self.database)
         self.iface.mapCanvas().refresh()
@@ -360,7 +359,6 @@ def manage_parcels(self):
             self.set_database_connection()
             if self.database is None:
                 return
-        self.refresh_layers()
         ParcelManager(self.iface, self.database, self.required_layers)
         validate_plugin_actions(self, self.database)
         self.iface.mapCanvas().refresh()
@@ -384,7 +382,6 @@ def manage_bearing_distance(self):
                 ("No Beacons available in the table. "
                  "Please use Beacon Manager tool to create a Beacon."))
         else:
-            self.refresh_layers()
             BearDistManager(self.iface, self.database, self.required_layers)
 
         self.iface.mapCanvas().refresh()
@@ -397,6 +394,7 @@ def manage_database_connection(self):
         crs = database_manager.get_current_crs()
         if connection:
             self.set_database_connection(connection=connection, crs=crs)
+            self.refresh_layers()
         validate_plugin_actions(self, self.database)