diff --git a/src/logic/pausemenu.rs b/src/logic/pausemenu.rs
index 109d3f0..48a3d3d 100644
--- a/src/logic/pausemenu.rs
+++ b/src/logic/pausemenu.rs
@@ -169,7 +169,7 @@ impl Screen for PauseMenuScreen {
         if draw_handle.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) {
             if menu_button.is_hovered(draw_handle) {
                 return Some(GameState::MainMenu);
-            } else if menu_button.is_hovered(draw_handle) {
+            } else if close_button.is_hovered(draw_handle) {
                 return Some(game_core.last_state);
             }
         }
diff --git a/src/logic/shop/mainui.rs b/src/logic/shop/mainui.rs
index e8ba083..680d139 100644
--- a/src/logic/shop/mainui.rs
+++ b/src/logic/shop/mainui.rs
@@ -1,6 +1,6 @@
 use raylib::prelude::*;
 
-use crate::{gamecore::{GameCore, GameState}, items::{AirBag, Flashlight, Flippers, ItemBase, StunGun}, lib::wrappers::audio::player::AudioPlayer};
+use crate::{gamecore::{GameCore, GameState}, items::{AirBag, Flashlight, Flippers, ItemBase, StunGun}, lib::{utils::button::OnScreenButton, wrappers::audio::player::AudioPlayer}};
 
 use super::{item::ShopItemWrapper, itemui::ShopItemUi};
 
@@ -89,6 +89,52 @@ pub fn render_shop(
     flippers_buy_ui.render(draw_handle, &game_core.player);
 
 
+    // Handle exit buttons
+    let bottom_left_button_dimensions = Rectangle {
+        x: bounds.x + 5.0,
+        y: bounds.y + bounds.height - 50.0,
+        width: (bounds.width / 2.0) - 15.0,
+        height: 40.0,
+    };
+    let bottom_right_button_dimensions = Rectangle {
+        x: (bounds.x + bottom_left_button_dimensions.width ) + 15.0,
+        y: bottom_left_button_dimensions.y,
+        width: bottom_left_button_dimensions.width,
+        height: bottom_left_button_dimensions.height,
+    };
+
+    let menu_button = OnScreenButton::new(
+        "Menu".to_string(),
+        bottom_left_button_dimensions,
+        Color::WHITE,
+        Color::BLACK,
+        Color::GRAY,
+        30,
+        true,
+    );
+    let play_button = OnScreenButton::new(
+        "Play".to_string(),
+        bottom_right_button_dimensions,
+        Color::WHITE,
+        Color::BLACK,
+        Color::GRAY,
+        30,
+        true,
+    );
+
+    // Render both
+    menu_button.render(draw_handle);
+    play_button.render(draw_handle);
+
+    // Handle click actions on the buttons
+    if draw_handle.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) {
+        if menu_button.is_hovered(draw_handle) {
+            return Some(GameState::MainMenu);
+        } else if play_button.is_hovered(draw_handle) {
+            return Some(GameState::InGame);
+        }
+    }
+
     return None;
 }