diff --git a/cockatrice/src/shortcutssettings.h b/cockatrice/src/shortcutssettings.h
index e4e2415d..55cf1280 100644
--- a/cockatrice/src/shortcutssettings.h
+++ b/cockatrice/src/shortcutssettings.h
@@ -231,6 +231,13 @@ private:
         {"DeckViewContainer/loadRemoteButton", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load remote deck"),
                                                            parseSequenceString("Ctrl+Alt+O"),
                                                            ShortcutGroup::Game_Lobby)},
+        {"DeckViewContainer/readyStartButton", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set ready to start"),
+                                                           parseSequenceString("Ctrl+Shift+S"),
+                                                           ShortcutGroup::Game_Lobby)},
+        {"DeckViewContainer/sideboardLockButton",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle sideboard lock"),
+                     parseSequenceString("Ctrl+B"),
+                     ShortcutGroup::Game_Lobby)},
         {"Player/aCCGreen", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Add green counter"),
                                         parseSequenceString(""),
                                         ShortcutGroup::Card_Counters)},
diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp
index 64d4e4da..734031e2 100644
--- a/cockatrice/src/tab_game.cpp
+++ b/cockatrice/src/tab_game.cpp
@@ -101,19 +101,22 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
 {
     loadLocalButton = new QPushButton;
     loadRemoteButton = new QPushButton;
-    if (parentGame->getIsLocalGame())
-        loadRemoteButton->setEnabled(false);
     readyStartButton = new ToggleButton;
     readyStartButton->setEnabled(false);
     sideboardLockButton = new ToggleButton;
     sideboardLockButton->setEnabled(false);
 
     connect(loadLocalButton, SIGNAL(clicked()), this, SLOT(loadLocalDeck()));
-    connect(loadRemoteButton, SIGNAL(clicked()), this, SLOT(loadRemoteDeck()));
     connect(readyStartButton, SIGNAL(clicked()), this, SLOT(readyStart()));
     connect(sideboardLockButton, SIGNAL(clicked()), this, SLOT(sideboardLockButtonClicked()));
     connect(sideboardLockButton, SIGNAL(stateChanged()), this, SLOT(updateSideboardLockButtonText()));
 
+    if (parentGame->getIsLocalGame()) {
+        loadRemoteButton->setEnabled(false);
+    } else {
+        connect(loadRemoteButton, SIGNAL(clicked()), this, SLOT(loadRemoteDeck()));
+    }
+
     auto *buttonHBox = new QHBoxLayout;
     buttonHBox->addWidget(loadLocalButton);
     buttonHBox->addWidget(loadRemoteButton);
@@ -140,7 +143,7 @@ void DeckViewContainer::retranslateUi()
 {
     loadLocalButton->setText(tr("Load deck..."));
     loadRemoteButton->setText(tr("Load remote deck..."));
-    readyStartButton->setText(tr("Ready to s&tart"));
+    readyStartButton->setText(tr("Ready to start"));
     updateSideboardLockButtonText();
 }
 
@@ -154,16 +157,20 @@ void DeckViewContainer::setButtonsVisible(bool _visible)
 
 void DeckViewContainer::updateSideboardLockButtonText()
 {
-    if (sideboardLockButton->getState())
-        sideboardLockButton->setText(tr("S&ideboard unlocked"));
-    else
-        sideboardLockButton->setText(tr("S&ideboard locked"));
+    if (sideboardLockButton->getState()) {
+        sideboardLockButton->setText(tr("Sideboard unlocked"));
+    } else {
+        sideboardLockButton->setText(tr("Sideboard locked"));
+    }
 }
 
 void DeckViewContainer::refreshShortcuts()
 {
     loadLocalButton->setShortcut(settingsCache->shortcuts().getSingleShortcut("DeckViewContainer/loadLocalButton"));
     loadRemoteButton->setShortcut(settingsCache->shortcuts().getSingleShortcut("DeckViewContainer/loadRemoteButton"));
+    readyStartButton->setShortcut(settingsCache->shortcuts().getSingleShortcut("DeckViewContainer/readyStartButton"));
+    sideboardLockButton->setShortcut(
+        settingsCache->shortcuts().getSingleShortcut("DeckViewContainer/sideboardLockButton"));
 }
 
 void TabGame::refreshShortcuts()