diff --git a/src/Client/GUI/PseuGUI.cpp b/src/Client/GUI/PseuGUI.cpp
index 21e6348..b5b61c0 100644
--- a/src/Client/GUI/PseuGUI.cpp
+++ b/src/Client/GUI/PseuGUI.cpp
@@ -293,6 +293,13 @@ bool PseuGUI::SetSceneData(uint32 index, uint32 value)
     return true;
 }
 
+uint32 PseuGUI::GetSceneState(void)
+{
+    if(!_scene)
+        return SCENESTATE_NOSCENE;
+    return _scene->GetState();
+}
+
 
 // used to get our current WorldPosition
 WorldPosition PseuGUI::GetWorldPosition(void)
diff --git a/src/Client/GUI/PseuGUI.h b/src/Client/GUI/PseuGUI.h
index b5cc6ae..e1cb022 100644
--- a/src/Client/GUI/PseuGUI.h
+++ b/src/Client/GUI/PseuGUI.h
@@ -12,12 +12,13 @@ class Scene;
 
 enum SceneState
 {
-    SCENESTATE_NULL,
+    SCENESTATE_NULL = 0,
     SCENESTATE_GUISTART,
     SCENESTATE_LOGINSCREEN,
     SCENESTATE_CHARACTERSELECTION,
     SCENESTATE_LOADING,
-    SCENESTATE_WORLD
+    SCENESTATE_WORLD,
+    SCENESTATE_NOSCENE = 0xFFFFFFFF
 };
 
 enum DriverIDs
@@ -96,7 +97,7 @@ public:
     // scenes
     void SetSceneState(SceneState);
     bool SetSceneData(uint32, uint32);
-    inline uint32 GetSceneState(void) { return _scenestate; }
+    uint32 GetSceneState(void);
 
     // helpers
     WorldPosition GetWorldPosition(void);
diff --git a/src/Client/GUI/Scene.cpp b/src/Client/GUI/Scene.cpp
index 0a2edd6..c3336e6 100644
--- a/src/Client/GUI/Scene.cpp
+++ b/src/Client/GUI/Scene.cpp
@@ -8,6 +8,7 @@ Scene::Scene(PseuGUI *g)
 {
     memset(scenedata, 0, sizeof(uint32) * SCENEDATA_SIZE);
     gui = g;
+    instance = gui->GetInstance();
     device = gui->_device;
     driver = gui->_driver;
     smgr = gui->_smgr;
@@ -15,6 +16,7 @@ Scene::Scene(PseuGUI *g)
     cursor = new CCursorController(device->getCursorControl(), driver);
     cursor->setOSCursorVisible(true);
     cursor->setVisible(false);
+    cursor->render(); // apply above settings
 }
 
 void Scene::OnDraw(void)
diff --git a/src/Client/GUI/Scene.h b/src/Client/GUI/Scene.h
index 74bd417..62b4604 100644
--- a/src/Client/GUI/Scene.h
+++ b/src/Client/GUI/Scene.h
@@ -31,7 +31,7 @@ public:
     virtual video::SColor GetBackgroundColor(void);
     virtual void SetData(uint32 index, uint32 value) { scenedata[index] = value; }
 protected:
-
+    PseuInstance *instance;
     PseuGUI *gui;
     irr::IrrlichtDevice *device;
     irr::video::IVideoDriver* driver;
diff --git a/src/Client/GUI/SceneWorld.cpp b/src/Client/GUI/SceneWorld.cpp
index bfb3d04..9c831bc 100644
--- a/src/Client/GUI/SceneWorld.cpp
+++ b/src/Client/GUI/SceneWorld.cpp
@@ -94,12 +94,12 @@ void SceneWorld::OnUpdate(s32 timediff)
 
     // object focused - only check if mouse moved, saves CPU
     // TODO: check if camera moved, also (maybe from external source)
-    if(false && mouse_pos != cursor->getMousePos())
+    /*if(mouse_pos != cursor->getMousePos())
     {
         focusedNode = smgr->getSceneCollisionManager()->getSceneNodeFromScreenCoordinatesBB(cursor->getMousePos());
         if(focusedNode && mouse_pressed_left)
             selectedNode = focusedNode;
-    }
+    }*/ // i'll continue working on this - [FG]
 
 
     if(eventrecv->key.pressed(KEY_KEY_W) || (mouse_pressed_left && mouse_pressed_right))
diff --git a/src/Client/PseuWoW.cpp b/src/Client/PseuWoW.cpp
index d55708a..393a7e4 100644
--- a/src/Client/PseuWoW.cpp
+++ b/src/Client/PseuWoW.cpp
@@ -329,6 +329,8 @@ void PseuInstance::Update()
         {
             logdetail("Disconnected, switching GUI back to Loginscreen.");
             _gui->SetSceneState(SCENESTATE_LOGINSCREEN);
+            while(_gui->GetSceneState() != SCENESTATE_LOGINSCREEN) // .. and wait until scenestate is set
+                Sleep(1);
         }
     }
 
diff --git a/src/Client/World/WorldSession.cpp b/src/Client/World/WorldSession.cpp
index 74a6dcd..de4da6e 100644
--- a/src/Client/World/WorldSession.cpp
+++ b/src/Client/World/WorldSession.cpp
@@ -40,6 +40,16 @@ WorldSession::WorldSession(PseuInstance *in)
 
 WorldSession::~WorldSession()
 {
+    if(PseuGUI *gui = GetInstance()->GetGUI())
+    {
+        if(gui->GetSceneState() == SCENESTATE_WORLD)
+            gui->SetSceneState(SCENESTATE_LOGINSCREEN); // kick back to login gui
+        logdebug("~WorldSession(): Waiting until world GUI is deleted");
+        while(gui->GetSceneState() == SCENESTATE_GUISTART) // .. and wait until the world gui is really deleted
+            GetInstance()->Sleep(1);                       // (it can cause crash otherwise)
+        logdebug("~WorldSession(): ... world GUI deleted, continuing to close session");
+    }
+        
     _instance->GetScripts()->RunScriptIfExists("_onworldsessiondelete");
 
     logdebug("~WorldSession(): %u packets left unhandled, and %u delayed. deleting.",pktQueue.size(),delayedPktQueue.size());