diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index f9d8c3459..8692573b4 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -381,6 +381,10 @@ namespace MWDialogue
 
     void DialogueManager::goodbyeSelected()
     {
+        // Do not close the dialogue window if the player has to answer a question
+        if (mIsInChoice)
+            return;
+
         MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Dialogue);
 
         // Apply disposition change to NPC's base disposition
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 7c590c8ef..99be5554a 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -19,12 +19,19 @@
 
 bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
 {
+    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+
     // actor id
     if (!info.mActor.empty())
+    {
         if ( Misc::StringUtils::lowerCase (info.mActor)!=MWWorld::Class::get (mActor).getId (mActor))
             return false;
-
-    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+    }
+    else if (isCreature)
+    {
+        // Creatures must not have topics aside of those specific to their id
+        return false;
+    }
 
     // NPC race
     if (!info.mRace.empty())
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index f62bf2a05..c7918ceb7 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -490,7 +490,7 @@ void DialogueWindow::onReferenceUnavailable()
 
 void DialogueWindow::onFrame()
 {
-    if(mEnabled && mPtr.getTypeName() == typeid(ESM::NPC).name())
+    if(mMainWidget->getVisible() && mEnabled && mPtr.getTypeName() == typeid(ESM::NPC).name())
     {
         int disp = std::max(0, std::min(100,
             MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)