diff --git a/modules/ti.UI/win/UserWindowWin.cpp b/modules/ti.UI/win/UserWindowWin.cpp
index 7720bdac3..89363ab70 100644
--- a/modules/ti.UI/win/UserWindowWin.cpp
+++ b/modules/ti.UI/win/UserWindowWin.cpp
@@ -23,6 +23,7 @@
 #include <comutil.h>
 #include <shellapi.h>
 #include <shlobj.h>
+#include <dbt.h>
 
 #include "MenuItemWin.h"
 #include "MenuWin.h"
@@ -197,6 +198,20 @@ static LRESULT CALLBACK UserWindowWndProc(HWND hWnd, UINT message, WPARAM wParam
             }
         }
         break;
+        case WM_DEVICECHANGE:
+        {
+            const char *evt = "volume.added";
+            switch(wParam)
+            {
+              case DBT_DEVICEREMOVECOMPLETE:
+                evt = "volume.removed";
+              case DBT_DEVICEARRIVAL:
+                PDEV_BROADCAST_HDR dev = (PDEV_BROADCAST_HDR)lParam;
+                if (dev->dbch_devicetype == DBT_DEVTYP_VOLUME)
+                    GlobalObject::GetInstance()->FireEvent(evt);
+            }
+        }
+        break;
     }
 
     if (!handled)