diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index e185fa4443641..068da9de917a3 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -777,6 +777,10 @@ bool CApplication::Create()
   // initialize the addon database (must be before the addon manager is init'd)
   CDatabaseManager::Get().Initialize(true);
 
+#ifdef HAS_PYTHON
+  CScriptInvocationManager::Get().RegisterLanguageInvocationHandler(&g_pythonParser, ".py");
+#endif // HAS_PYTHON
+
   // start-up Addons Framework
   // currently bails out if either cpluff Dll is unavailable or system dir can not be scanned
   if (!CAddonMgr::Get().Init())