diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp
index 1af187aa28..06dd4ed827 100644
--- a/src/frontends/qt4/GuiCitation.cpp
+++ b/src/frontends/qt4/GuiCitation.cpp
@@ -175,6 +175,8 @@ GuiCitation::GuiCitation(GuiView & lv)
 	selectedLV->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
 #endif
 
+	selectedLV->setToolTip(qt_("Ordered list of all cited references.\n"
+				   "You can reorder, add and remove references with the buttons on the left."));
 	setFocusProxy(filter_);
 }
 
@@ -353,6 +355,12 @@ void GuiCitation::updateFormatting(CitationStyle const & currentStyle)
 			starredCB->setToolTip(qt_("Always list all authors (rather than using \"et al.\"), "
 						  "if the current citation style supports this."));
 	}
+	if (availableLV->selectionModel()->selectedIndexes().isEmpty())
+		availableLV->setToolTip(qt_("All references available for citing."));
+	else
+		availableLV->setToolTip(qt_("All references available for citing.\n"
+					    "To add the selected one, hit Add, press Enter or double-click.\n"
+					    "Hit Ctrl-Enter to add and close the dialog."));
 }
 
 
diff --git a/src/frontends/qt4/ui/CitationUi.ui b/src/frontends/qt4/ui/CitationUi.ui
index e5c0bc011a..bbec63f7c8 100644
--- a/src/frontends/qt4/ui/CitationUi.ui
+++ b/src/frontends/qt4/ui/CitationUi.ui
@@ -123,9 +123,7 @@
            <item>
             <widget class="QListView" name="availableLV">
              <property name="toolTip">
-              <string>All references available for citing.
-To select one, hit Add, press Enter or double-click.
-Hit Ctrl-Enter to select and close the dialog.</string>
+              <string/>
              </property>
              <property name="editTriggers">
               <set>QAbstractItemView::NoEditTriggers</set>
@@ -241,8 +239,7 @@ Hit Ctrl-Enter to select and close the dialog.</string>
            <item>
             <widget class="QTableView" name="selectedLV">
              <property name="toolTip">
-              <string>Ordered list of all cited references.
-You can reorder, add and remove references with the buttons on the left.</string>
+              <string/>
              </property>
             </widget>
            </item>
diff --git a/status.23x b/status.23x
index caa3efb3cf..c07d5058a8 100644
--- a/status.23x
+++ b/status.23x
@@ -71,6 +71,8 @@ What's new
 - Update Simplified Chinese, German, Italian and Slovak user interface
   localization.
 
+- Add some tooltips in citation dialog in favor of keyboard users (bug 11317).
+
 
 * BUILD/INSTALLATION