diff --git a/src/engine.c b/src/engine.c
index fa34212d..905894b6 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -1484,7 +1484,6 @@ void Main_handler(void)
                 Close_popup();
 
                 Mouse_K = x; // Close_popup waits for end of click and resets Mouse_K...
-                goto HANDLE_CLICK;
               }
 
               Print_in_menu(Menu_tooltip[button_index],0);
diff --git a/src/layers.c b/src/layers.c
index 26862884..28b5c58c 100644
--- a/src/layers.c
+++ b/src/layers.c
@@ -165,7 +165,7 @@ short Layer_under_mouse(void)
 
 void Button_Layer_select(void)
 {
-  short layer = Layer_under_mouse;
+  short layer = Layer_under_mouse();
   Layer_activate(layer, LEFT_SIDE);
 }