diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/blackgui/menus/aircraftmodelmenus.cpp
index 9fd9c151b..45239e7f5 100644
--- a/src/blackgui/menus/aircraftmodelmenus.cpp
+++ b/src/blackgui/menus/aircraftmodelmenus.cpp
@@ -75,7 +75,6 @@ namespace BlackGui
                     menuActions.addMenuSimulator();
                     if (this->m_messageFrame)
                     {
-                        const CAircraftModel model(mv->selectedObject());
                         if (!model.getIconPath().isEmpty())
                         {
                             this->m_iconAction = menuActions.addAction(this->m_iconAction, CIcons::appAircraft16(), "Display icon", CMenuAction::pathSimulator(), { this, &CShowSimulatorFileMenu::ps_displayIcon });
diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp
index 2de45e17a..8dfa889da 100644
--- a/src/blackgui/views/viewbase.cpp
+++ b/src/blackgui/views/viewbase.cpp
@@ -438,9 +438,14 @@ namespace BlackGui
             if (name.isEmpty())
             {
                 // create a name
-                if (this->getDockWidgetInfoArea()) { name = this->getDockWidgetInfoArea()->windowTitle(); }
-                else if (!windowTitle().isEmpty()) { name = this->windowType(); }
-                else { name = this->metaObject()->className(); }
+                if (this->getDockWidgetInfoArea())
+                {
+                    name = this->getDockWidgetInfoArea()->windowTitle();
+                }
+                else
+                {
+                    name = this->metaObject()->className();
+                }
             }
             if (!name.endsWith(CFileUtils::jsonAppendix(), Qt::CaseInsensitive))
             {