diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 940a36b00..9498ea52d 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -263,7 +263,7 @@ namespace MWClass
         if(lockLevel!=0)
             ptr.getCellRef().setLockLevel(abs(lockLevel)); //Changes lock to locklevel, in positive
         else
-            ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
+            ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the original one
     }
 
     void Container::unlock (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 8f8bab025..0cea50f1b 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -509,6 +509,17 @@ namespace MWGui
             // no scrollbar
             onScrollbarMoved(mScrollBar, 0);
         }
+
+        MyGUI::Button* byeButton;
+        getWidget(byeButton, "ByeButton");
+        if(MWBase::Environment::get().getDialogueManager()->isInChoice()) {
+            byeButton->setAlpha(.2);
+            byeButton->setEnabled(false);
+        }
+        else {
+            byeButton->setAlpha(1);
+            byeButton->setEnabled(true);
+        }
     }
 
     void DialogueWindow::notifyLinkClicked (TypesetBook::InteractiveId link)