diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 2df3113b3..51a17d380 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -151,6 +151,8 @@ namespace MWBase
 
             virtual void updateSpellWindow() = 0;
 
+            virtual void setConsoleSelectedObject(const MWWorld::Ptr& object) = 0;
+
             /// Set value for the given ID.
             virtual void setValue (const std::string& id, const MWMechanics::AttributeValue& value) = 0;
             virtual void setValue (int parSkill, const MWMechanics::SkillValue& value) = 0;
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index 182b6ef97..6094111f8 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -417,7 +417,7 @@ namespace MWGui
         setCoord(10,10, width-10, height/2);
     }
 
-    void Console::setPtr(const MWWorld::Ptr& object)
+    void Console::setSelectedObject(const MWWorld::Ptr& object)
     {
         if (!object.isEmpty())
         {
@@ -443,12 +443,12 @@ namespace MWGui
 
     void Console::onReferenceUnavailable()
     {
-        setPtr(MWWorld::Ptr());
+        setSelectedObject(MWWorld::Ptr());
     }
 
     void Console::resetReference()
     {
         ReferenceInterface::resetReference();
-        setPtr(MWWorld::Ptr());
+        setSelectedObject(MWWorld::Ptr());
     }
 }
diff --git a/apps/openmw/mwgui/console.hpp b/apps/openmw/mwgui/console.hpp
index f243b8387..f5647e9ea 100644
--- a/apps/openmw/mwgui/console.hpp
+++ b/apps/openmw/mwgui/console.hpp
@@ -25,7 +25,7 @@ namespace MWGui
     {
         public:
             /// Set the implicit object for script execution
-            void setPtr(const MWWorld::Ptr& object);
+            void setSelectedObject(const MWWorld::Ptr& object);
 
             MyGUI::EditBox* mCommandLine;
             MyGUI::EditBox* mHistory;
@@ -42,12 +42,9 @@ namespace MWGui
             virtual void onOpen();
             virtual void onClose();
 
-            void onFrame(float dt) { checkReferenceAvailable(); }
-
             void setFont(const std::string &fntName);
 
             void onResChange(int width, int height);
-            void clear() { resetReference(); }
 
             // Print a message to the console, in specified color.
             void print(const std::string &msg, const std::string& color = "#FFFFFF");
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 779e358d3..1db2691f4 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -260,7 +260,7 @@ namespace MWGui
             MWWorld::Ptr object = MWBase::Environment::get().getWorld()->getFacedObject();
 
             if (mode == GM_Console)
-                MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Console, object);
+                MWBase::Environment::get().getWindowManager()->setConsoleSelectedObject(object);
             else if ((mode == GM_Container) || (mode == GM_Inventory))
             {
                 // pick up object
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 76f0b029d..85f57a75e 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1884,6 +1884,11 @@ namespace MWGui
             mSpellWindow->updateSpells();
     }
 
+    void WindowManager::setConsoleSelectedObject(const MWWorld::Ptr &object)
+    {
+        mConsole->setSelectedObject(object);
+    }
+
     std::string WindowManager::correctIconPath(const std::string& path)
     {
         return Misc::ResourceHelpers::correctIconPath(path, mResourceSystem->getVFS());
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 56e7d9b7b..53b2dc33a 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -190,6 +190,8 @@ namespace MWGui
 
     virtual void updateSpellWindow();
 
+    virtual void setConsoleSelectedObject(const MWWorld::Ptr& object);
+
     ///< Set value for the given ID.
     virtual void setValue (const std::string& id, const MWMechanics::AttributeValue& value);
     virtual void setValue (int parSkill, const MWMechanics::SkillValue& value);