diff --git a/xbmc/interfaces/python/xbmcmodule/window.cpp b/xbmc/interfaces/python/xbmcmodule/window.cpp
index 9b9184a..d4ab227 100644
--- a/xbmc/interfaces/python/xbmcmodule/window.cpp
+++ b/xbmc/interfaces/python/xbmcmodule/window.cpp
@@ -930,10 +930,13 @@ namespace PYXBMC
     if (!PyXBMCGetUnicodeString(uText, value, 1))
       return NULL;

-    GilSafeSingleLock lock(g_graphicsContext);
     CStdString lowerKey = key;
+    {
+      CPyThreadState gil;
+      CSingleLock lock(g_graphicsContext);

-    self->pWindow->SetProperty(lowerKey.ToLower(), uText);
+      self->pWindow->SetProperty(lowerKey.ToLower(), uText);
+    }

     Py_INCREF(Py_None);
     return Py_None;