diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index e9a3c440..c431d469 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -2931,7 +2931,7 @@
     <addaction name="actionTileset_Editor"/>
     <addaction name="actionRegion_Map_Editor"/>
     <addaction name="separator"/>
-    <addaction name="actionImport_Layout_from_Advance_Map_1_92"/>
+    <addaction name="actionImport_Map_from_Advance_Map_1_92"/>
     <addaction name="separator"/>
     <addaction name="actionOpen_Project_in_Text_Editor"/>
    </widget>
@@ -3222,9 +3222,9 @@
     <string>Open Config Folder</string>
    </property>
   </action>
-  <action name="actionImport_Layout_from_Advance_Map_1_92">
+  <action name="actionImport_Map_from_Advance_Map_1_92">
    <property name="text">
-    <string>Import Layout from Advance Map 1.92...</string>
+    <string>Import Map from Advance Map 1.92...</string>
    </property>
   </action>
   <action name="actionProject_Settings">
diff --git a/include/mainwindow.h b/include/mainwindow.h
index 17f19623..22f64a81 100644
--- a/include/mainwindow.h
+++ b/include/mainwindow.h
@@ -234,7 +234,7 @@ private slots:
     void on_action_Export_Map_Image_triggered();
     void on_actionExport_Stitched_Map_Image_triggered();
     void on_actionExport_Map_Timelapse_Image_triggered();
-    void on_actionImport_Layout_from_Advance_Map_1_92_triggered();
+    void on_actionImport_Map_from_Advance_Map_1_92_triggered();
 
     void on_pushButton_AddConnection_clicked();
     void on_button_OpenDiveMap_clicked();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9623963a..ff39fef7 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2636,8 +2636,8 @@ void MainWindow::on_actionExport_Map_Timelapse_Image_triggered() {
     showExportMapImageWindow(ImageExporterMode::Timelapse);
 }
 
-void MainWindow::on_actionImport_Layout_from_Advance_Map_1_92_triggered() {
-    QString filepath = FileDialog::getOpenFileName(this, "Import Layout from Advance Map 1.92", "", "Advance Map 1.92 Map Files (*.map)");
+void MainWindow::on_actionImport_Map_from_Advance_Map_1_92_triggered() {
+    QString filepath = FileDialog::getOpenFileName(this, "Import Map from Advance Map 1.92", "", "Advance Map 1.92 Map Files (*.map)");
     if (filepath.isEmpty()) {
         return;
     }
@@ -2658,8 +2658,8 @@ void MainWindow::on_actionImport_Layout_from_Advance_Map_1_92_triggered() {
 
     auto dialog = new NewLayoutDialog(this->editor->project, mapLayout, this);
     connect(dialog, &NewLayoutDialog::applied, this, &MainWindow::userSetLayout);
+    connect(dialog, &NewLayoutDialog::finished, [mapLayout] { mapLayout->deleteLater(); });
     dialog->open();
-    delete mapLayout;
 }
 
 void MainWindow::showExportMapImageWindow(ImageExporterMode mode) {
diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp
index b6bf1735..940761ad 100644
--- a/src/ui/tileseteditor.cpp
+++ b/src/ui/tileseteditor.cpp
@@ -987,6 +987,7 @@ void TilesetEditor::importTilesetMetatiles(Tileset *tileset, bool primary)
         msgBox.setDefaultButton(QMessageBox::Ok);
         msgBox.setIcon(QMessageBox::Icon::Critical);
         msgBox.exec();
+        qDeleteAll(metatiles);
         return;
     }