diff --git a/src/databricks/labs/lsql/dashboards.py b/src/databricks/labs/lsql/dashboards.py
index 3711e1f7..6d88df31 100644
--- a/src/databricks/labs/lsql/dashboards.py
+++ b/src/databricks/labs/lsql/dashboards.py
@@ -346,7 +346,7 @@ def validate(self) -> None:
 
     def get_layouts(self) -> Iterable[Layout]:
         """Get the layout(s) reflecting this tile in the dashboard."""
-        widget = Widget(name=self.metadata.id, textbox_spec=self.content)
+        widget = Widget(name=f"{self.metadata.id}_widget", textbox_spec=self.content)
         layout = Layout(widget=widget, position=self.position)
         yield layout
 
@@ -914,7 +914,8 @@ def save_to_folder(self, dashboard: Dashboard, local_path: Path) -> Dashboard:
                 yaml.safe_dump(page.as_dict(), f)
             for layout in page.layout:
                 if layout.widget.textbox_spec is not None:
-                    (local_path / f"{layout.widget.name}.md").write_text(layout.widget.textbox_spec)
+                    name = layout.widget.name.removesuffix("_widget")
+                    (local_path / f"{name}.md").write_text(layout.widget.textbox_spec)
         return dashboard
 
     def create_dashboard(