diff --git a/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp b/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp
index 2477b111..1688d348 100644
--- a/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp
+++ b/SHADE_Engine/src/Graphics/Windowing/SHWindow.cpp
@@ -272,6 +272,17 @@ namespace SHADE
     windowResizeCallbacks.erase(callbackid);
   }
 
+  SHWindow::CALLBACKID SHWindow::RegisterWindowCloseCallback(WindowResizeCallbackFn windowCloseCallback)
+  {
+    windowCloseCallbacks.try_emplace(windowResizeCallbackCount, windowCloseCallback);
+    return windowCloseCallbackCount++;
+  }
+
+  void SHWindow::UnregisterWindowCloseCallback(CALLBACKID const& callbackid)
+  {
+    windowCloseCallbacks.erase(callbackid);
+  }
+
   LRESULT SHWindow::WndProcStatic(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
   {
     auto window = windowMap.GetWindow(hwnd);
@@ -307,6 +318,8 @@ namespace SHADE
     case WM_CREATE:
       OnCreate(hwnd, reinterpret_cast<LPCREATESTRUCT>(wparam));
       break;
+    case WM_CLOSE:
+
     case WM_DESTROY:
       OnDestroy();
       return 0;
@@ -365,6 +378,14 @@ namespace SHADE
     
   }
 
+  void SHADE::SHWindow::OnClose()
+  {
+    for (const auto& callbackFn : windowCloseCallbacks | std::views::values)
+    {
+      callbackFn();
+    }
+  }
+
   void SHWindow::OnDestroy()
   {
     this->Destroy();
diff --git a/SHADE_Engine/src/Graphics/Windowing/SHWindow.h b/SHADE_Engine/src/Graphics/Windowing/SHWindow.h
index 9dcaedd9..b1c1067d 100644
--- a/SHADE_Engine/src/Graphics/Windowing/SHWindow.h
+++ b/SHADE_Engine/src/Graphics/Windowing/SHWindow.h
@@ -75,6 +75,7 @@ namespace SHADE
   public:
     using SHVec2 = std::pair<uint32_t, uint32_t>;
     typedef std::function<void(uint32_t width, uint32_t height)>  WindowResizeCallbackFn;
+    typedef std::function<void(void)>  WindowCloseCallbackFn;
     typedef uint16_t CALLBACKID;
     SHWindow();
 
@@ -125,6 +126,8 @@ namespace SHADE
 
     CALLBACKID RegisterWindowSizeCallback(WindowResizeCallbackFn);
     void UnregisterWindowSizeCallback(CALLBACKID const& callbackid);
+    CALLBACKID RegisterWindowCloseCallback(WindowResizeCallbackFn);
+    void UnregisterWindowCloseCallback(CALLBACKID const& callbackid);
     bool IsMinimized() const { return wndData.isMinimised; }
 
   protected:
@@ -157,10 +160,13 @@ namespace SHADE
     HFONT font;
 
     std::unordered_map<CALLBACKID, WindowResizeCallbackFn> windowResizeCallbacks;
+    std::unordered_map<CALLBACKID, WindowCloseCallbackFn> windowCloseCallbacks;
     CALLBACKID windowResizeCallbackCount{};
+    CALLBACKID windowCloseCallbackCount{};
     //TODO: Shift to events abstraction
 
     void OnCreate(HWND hwnd, LPCREATESTRUCT create_struct);
+    void OnClose();
     void OnDestroy();
     //void OnFileDrop(HDROP drop);
     void OnSize(UINT msg, UINT type, SIZE size);