diff --git a/application/forms/Dashboard/SetupNewDashboardForm.php b/application/forms/Dashboard/SetupNewDashboardForm.php
index 6fe4651f958..f980be5d540 100644
--- a/application/forms/Dashboard/SetupNewDashboardForm.php
+++ b/application/forms/Dashboard/SetupNewDashboardForm.php
@@ -63,7 +63,7 @@ protected function dumpArbitaryDashlets(bool $strict = true): void
                     if (! $strict && $title && $url) {
                         $dashlet
                             ->setUrl($url)
-                            ->setName($title)
+                            ->setName($title . '(' . $module . ')')
                             ->setTitle($title);
                     }
 
diff --git a/library/Icinga/Web/Dashboard/Pane.php b/library/Icinga/Web/Dashboard/Pane.php
index 559d96e0b01..3e2365d3aaa 100644
--- a/library/Icinga/Web/Dashboard/Pane.php
+++ b/library/Icinga/Web/Dashboard/Pane.php
@@ -212,6 +212,8 @@ public function manageEntry($entryOrEntries, BaseDashboard $origin = null, bool
                         'module_dashlet_id' => $systemUuid
                     ]);
                 }
+
+                $this->addEntry($dashlet);
             } elseif (! $this->hasEntry($dashlet->getName()) || ! $moveDashlet) {
                 $filterCondition = [
                     'id = ?'           => $dashlet->getUuid(),