diff --git a/aqt/deckchooser.py b/aqt/deckchooser.py
index 8ab383cd4..9d311d5d6 100644
--- a/aqt/deckchooser.py
+++ b/aqt/deckchooser.py
@@ -5,7 +5,7 @@
 from aqt.qt import *
 from operator import itemgetter
 from anki.hooks import addHook, remHook, runHook
-from aqt.utils import isMac
+from aqt.utils import isMac, shortcut
 import aqt
 
 class DeckChooser(QHBoxLayout):
@@ -28,7 +28,7 @@ class DeckChooser(QHBoxLayout):
             self.addWidget(self.deckLabel)
         # decks box
         self.deck = QPushButton()
-        self.deck.setToolTip(_("Target Deck (Ctrl+D)"))
+        self.deck.setToolTip(shortcut(_("Target Deck (Ctrl+D)")))
         s = QShortcut(QKeySequence(_("Ctrl+D")), self.widget)
         s.connect(s, SIGNAL("activated()"), self.onDeckChange)
         self.addWidget(self.deck)
diff --git a/aqt/modelchooser.py b/aqt/modelchooser.py
index 52911d1af..e53c491d4 100644
--- a/aqt/modelchooser.py
+++ b/aqt/modelchooser.py
@@ -5,7 +5,7 @@
 from aqt.qt import *
 from operator import itemgetter
 from anki.hooks import addHook, remHook, runHook
-from aqt.utils import isMac
+from aqt.utils import isMac, shortcut
 import aqt
 
 class ModelChooser(QHBoxLayout):
@@ -29,7 +29,7 @@ class ModelChooser(QHBoxLayout):
         # models box
         self.models = QPushButton()
         #self.models.setStyleSheet("* { text-align: left; }")
-        self.models.setToolTip(_("Change Note Type (Ctrl+N)"))
+        self.models.setToolTip(shortcut(_("Change Note Type (Ctrl+N)")))
         s = QShortcut(QKeySequence(_("Ctrl+N")), self.widget)
         s.connect(s, SIGNAL("activated()"), self.onModelChange)
         self.addWidget(self.models)
diff --git a/aqt/studydeck.py b/aqt/studydeck.py
index be4d5ffbb..d8e7607f5 100644
--- a/aqt/studydeck.py
+++ b/aqt/studydeck.py
@@ -5,7 +5,7 @@
 from aqt.qt import *
 import aqt
 from anki.utils import ids2str
-from aqt.utils import showInfo, showWarning, openHelp, getOnlyText
+from aqt.utils import showInfo, showWarning, openHelp, getOnlyText, shortcut
 from operator import itemgetter
 from anki.hooks import addHook, remHook
 
@@ -29,7 +29,7 @@ class StudyDeck(QDialog):
         else:
             b = QPushButton(_("Add"))
             b.setShortcut(QKeySequence("Ctrl+N"))
-            b.setToolTip(_("Add New Deck (Ctrl+N)"))
+            b.setToolTip(shortcut(_("Add New Deck (Ctrl+N)")))
             self.form.buttonBox.addButton(b, QDialogButtonBox.ActionRole)
             b.connect(b, SIGNAL("clicked()"), self.onAddDeck)
         if title: