diff --git a/reactos/base/applications/imagesoft/imagesoft.rbuild b/reactos/base/applications/imagesoft/imagesoft.rbuild
index 77acd55c238..1b2b02e24b4 100644
--- a/reactos/base/applications/imagesoft/imagesoft.rbuild
+++ b/reactos/base/applications/imagesoft/imagesoft.rbuild
@@ -15,7 +15,7 @@
 		<library>comctl32</library>
 		<library>shell32</library>
 		<library>comdlg32</library>
-		<compilationunit name="about.c">
+		<compilationunit name="unit.c">
 			<file>about.c</file>
 			<file>floatwindow.c</file>
 			<file>imageprop.c</file>
diff --git a/reactos/base/applications/imagesoft/imgedwnd.c b/reactos/base/applications/imagesoft/imgedwnd.c
index 8d8161b1121..8fa25c0d552 100644
--- a/reactos/base/applications/imagesoft/imgedwnd.c
+++ b/reactos/base/applications/imagesoft/imgedwnd.c
@@ -333,6 +333,8 @@ ImageEditWndProc(HWND hwnd,
 
             hPenOld = SelectObject(hDC,
                                    hPen);
+            SelectObject(Info->hDCMem,
+                         hPen);
 
             MoveToEx(hDC,
                      xMouse,
@@ -355,7 +357,9 @@ ImageEditWndProc(HWND hwnd,
                    xMouse,
                    yMouse);
 
-            DeleteObject(SelectObject(hDC,
+            SelectObject(hDC,
+                         hPenOld);
+            DeleteObject(SelectObject(Info->hDCMem,
                                       hPenOld));
 
             ReleaseDC(Info->hSelf,
@@ -532,3 +536,4 @@ UninitImageEditWindowImpl(VOID)
     UnregisterClass(szImageEditWndClass,
                     hInstance);
 }
+