diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c
index 280cc6f78ea..aa14d44cdc3 100644
--- a/base/applications/clipbrd/clipbrd.c
+++ b/base/applications/clipbrd/clipbrd.c
@@ -409,6 +409,8 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
 
             UpdateDisplayMenu();
             SetDisplayFormat(0);
+
+            DragAcceptFiles(hWnd, TRUE);
             break;
         }
 
@@ -733,8 +735,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
     }
 
     /* If the user provided a path to a clipboard data file, try to open it */
-    if (lpCmdLine != NULL && *lpCmdLine)
-        LoadClipboardDataFromFile(lpCmdLine);
+    if (__argc >= 2)
+        LoadClipboardDataFromFile(__wargv[1]);
 
     while (GetMessageW(&msg, 0, 0, 0))
     {
diff --git a/base/applications/clipbrd/precomp.h b/base/applications/clipbrd/precomp.h
index 7a04b962c40..e5dd1781abe 100644
--- a/base/applications/clipbrd/precomp.h
+++ b/base/applications/clipbrd/precomp.h
@@ -25,6 +25,7 @@
 #include <htmlhelp.h>
 #include <commdlg.h>
 #include <winnls.h>
+#include <stdlib.h>
 
 #include "resources.h"
 #include "cliputils.h"