diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index b96bf85f6f..4a30532f5e 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -968,7 +968,9 @@ namespace MWGui
         {
             if (mChoices.size() > 0)
             {
-                if (mControllerChoice >= 0 && mControllerChoice < static_cast<int>(mChoices.size()))
+                if (mChoices.size() == 1)
+                    onChoiceActivated(mChoices[0].second);
+                else if (mControllerChoice >= 0 && mControllerChoice < static_cast<int>(mChoices.size()))
                     onChoiceActivated(mChoices[mControllerChoice].second);
             }
             else if (mControllerFocus == static_cast<int>(mTopicsList->getItemCount()))
@@ -1025,6 +1027,18 @@ namespace MWGui
                 setControllerFocus(mControllerFocus, true);
             }
         }
+        else if (arg.button == SDL_CONTROLLER_BUTTON_LEFTSHOULDER && mChoices.size() == 0)
+        {
+            setControllerFocus(mControllerFocus, false);
+            mControllerFocus = std::max(mControllerFocus - 5, 0);
+            setControllerFocus(mControllerFocus, true);
+        }
+        else if (arg.button == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER && mChoices.size() == 0)
+        {
+            setControllerFocus(mControllerFocus, false);
+            mControllerFocus = std::min(mControllerFocus + 5, static_cast<int>(mTopicsList->getItemCount()));
+            setControllerFocus(mControllerFocus, true);
+        }
 
         return true;
     }