diff --git a/src/app_layout.cpp b/src/app_layout.cpp
index 0d1f272..c3eef4f 100644
--- a/src/app_layout.cpp
+++ b/src/app_layout.cpp
@@ -370,40 +370,45 @@ void App::init_menu_file()
             popup->m_flood_events = true;
             popup->m_capture_children = false;
 
-            popup->find<NodeButtonCustom>("file-newdoc")->on_click = [this](Node*) {
-                dialog_newdoc();
-                popup->mouse_release();
-                popup->destroy();
-            };
-            popup->find<NodeButtonCustom>("file-import")->on_click = [this](Node*) {
-                App::I.pick_image([](std::string path){
-                    Canvas::I->import_equirectangular(path);
-                });
-                popup->mouse_release();
-                popup->destroy();
-            };
-            popup->find<NodeButtonCustom>("file-open")->on_click = [this](Node*) {
-                dialog_open();
-                popup->mouse_release();
-                popup->destroy();
-            };
-            popup->find<NodeButtonCustom>("file-browse")->on_click = [this](Node*) {
-                dialog_browse();
-                popup->mouse_release();
-                popup->destroy();
-            };
-            popup->find<NodeButtonCustom>("file-save")->on_click = [this](Node*) {
-                if (ui::Canvas::I->m_newdoc)
-                {
-                    dialog_save();
-                }
-                else if(ui::Canvas::I->m_unsaved)
-                {
-                    canvas->m_canvas->project_save();
-                }
-                popup->mouse_release();
-                popup->destroy();
-            };
+            if (auto b = popup->find<NodeButtonCustom>("file-newdoc"))
+                b->on_click = [this](Node*) {
+                    dialog_newdoc();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+            if (auto b = popup->find<NodeButtonCustom>("file-import"))
+                b->on_click = [this](Node*) {
+                    App::I.pick_image([](std::string path){
+                        Canvas::I->import_equirectangular(path);
+                    });
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+            if (auto b = popup->find<NodeButtonCustom>("file-open"))
+                b->on_click = [this](Node*) {
+                    dialog_open();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+            if (auto b = popup->find<NodeButtonCustom>("file-browse"))
+                b->on_click = [this](Node*) {
+                    dialog_browse();
+                    popup->mouse_release();
+                    popup->destroy();
+                };
+            if (auto b = popup->find<NodeButtonCustom>("file-save"))
+                b->on_click = [this](Node*) {
+                    if (ui::Canvas::I->m_newdoc)
+                    {
+                        dialog_save();
+                    }
+                    else if(ui::Canvas::I->m_unsaved)
+                    {
+                        canvas->m_canvas->project_save();
+                    }
+                    popup->mouse_release();
+                    popup->destroy();
+                };
             if (auto b = popup->find<NodeButtonCustom>("file-save-as"))
                 b->on_click = [this](Node*) {
                     dialog_save();