diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp
index 23c8f7a02b8..7d1f6af427b 100644
--- a/base/applications/mspaint/main.cpp
+++ b/base/applications/mspaint/main.cpp
@@ -6,10 +6,12 @@
  * PROGRAMMERS: Benedikt Freisen
  */
 
-/* INCLUDES *********************************************************/
-
 #include "precomp.h"
 
+#ifdef _DEBUG
+#include <crtdbg.h>
+#endif
+
 /* FUNCTIONS ********************************************************/
 
 POINT start;
@@ -159,6 +161,11 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument
         0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff
     };
 
+#ifdef _DEBUG
+    /* Report any memory leaks on exit */
+    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+
     /* init font for text tool */
     ZeroMemory(&lfTextFont, sizeof(lfTextFont));
     lfTextFont.lfHeight = 0;