diff --git a/changelog.txt b/changelog.txt
index cd5227d4..f4e0b3da 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,6 @@
 ---version 2.0.4 yet to be released---
-25-feb-2009 - adelikat - 2in32 - Memwatch - added cancel to save changes? message box
+01-mar-2009 - adelikat - win32 - Drag & Drop Lua files
+25-feb-2009 - adelikat - win32 - Memwatch - added cancel to save changes? message box
 22-feb-2009 - adelikat - win32 - Lua - made speedmode("turbo") turn on turbo (which employs frameskipping) rather than max speed
 22-feb-2009 - adelikat - Increased lua gui.text height (and DrawTextTransWH() height)
 21-feb-2009 - adelikat - win32 - Lua - Added -lua commandline argment, loads a lua script on startup
diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp
index 21eff271..6b13fa56 100644
--- a/src/drivers/win/window.cpp
+++ b/src/drivers/win/window.cpp
@@ -1046,6 +1046,11 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
 						FCEUI_LoadMovie(ftmp, 1, false, false);		 //We are convinced it is a movie file, attempt to load it
 				}
 				//-------------------------------------------------------
+				//Check if Lua file
+				//-------------------------------------------------------
+				else if (!(fileDropped.find(".lua") == string::npos) && !(fileDropped.find(".lua") == string::npos))
+					FCEU_LoadLuaCode(ftmp);
+				//-------------------------------------------------------
 				//If not a movie, Load it as a ROM file
 				//-------------------------------------------------------
 				else