diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index c0896d5b5e..1657225343 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -360,7 +360,7 @@ namespace MWGui
 
     ControllerButtonStr* ContainerWindow::getControllerButtons()
     {
-        mControllerButtons.l1 = mDisposeCorpseButton->getVisible() ? "#{sDisposeofCorpse}" : "";
+        mControllerButtons.r1 = mDisposeCorpseButton->getVisible() ? "#{sDisposeofCorpse}" : "";
         return &mControllerButtons;
     }
 
@@ -380,7 +380,7 @@ namespace MWGui
         {
             onTakeAllButtonClicked(mTakeButton);
         }
-        else if (arg.button == SDL_CONTROLLER_BUTTON_LEFTSHOULDER)
+        else if (arg.button == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)
         {
             if (mDisposeCorpseButton->getVisible())
                 onDisposeCorpseButtonClicked(mDisposeCorpseButton);
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index 69004171db..8fbeb161ec 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -281,6 +281,8 @@ namespace
 
             updateShowingPages();
             updateCloseJournalButton();
+
+            MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
         void setOptionsMode()
@@ -480,6 +482,7 @@ namespace
             popBook();
 
             MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page"));
+            MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
         void addControllerButtons(Gui::MWList* _list, int _selectedIndex)
@@ -518,6 +521,7 @@ namespace
                 addControllerButtons(list, mSelectedQuest);
 
             MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page"));
+            MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
         void notifyTopics(MyGUI::Widget* _sender)
@@ -533,6 +537,7 @@ namespace
             setVisible(ShowActiveBTN, false);
 
             MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page"));
+            MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
         struct AddNamesToList
@@ -594,6 +599,7 @@ namespace
             }
 
             MWBase::Environment::get().getWindowManager()->playSound(ESM::RefId::stringRefId("book page"));
+            MWBase::Environment::get().getWindowManager()->updateControllerButtonsOverlay();
         }
 
         void notifyShowAll(MyGUI::Widget* _sender)
@@ -678,6 +684,7 @@ namespace
             mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{sClose}";
             mControllerButtons.l1 = mOptionsMode ? "" : "#{sPrev}";
             mControllerButtons.r1 = mOptionsMode ? "" : "#{sNext}";
+            mControllerButtons.r3 = mOptionsMode && mQuestMode ? "Show All" : "";
             return &mControllerButtons;
         }
 
@@ -758,6 +765,13 @@ namespace
                 }
                 return true;
             }
+            else if (arg.button == SDL_CONTROLLER_BUTTON_RIGHTSTICK) // R3: Show All/Some
+            {
+                if (mAllQuests)
+                    notifyShowActive(getWidget<MyGUI::Widget>(ShowActiveBTN));
+                else
+                    notifyShowAll(getWidget<MyGUI::Widget>(ShowAllBTN));
+            }
             else if (arg.button == SDL_CONTROLLER_BUTTON_DPAD_UP)
             {
                 if (mOptionsMode && (mQuestMode || mTopicsMode))