diff --git a/TODO b/TODO
index 8fb39901b..d7e5ee707 100644
--- a/TODO
+++ b/TODO
@@ -84,5 +84,6 @@ beta4->beta5 changelog:
 - BUGFIX: Fixed session ratio value (was either 10. or 1.)
 - BUGFIX: Improved incremental download
 - BUGFIX: Fixed preview from seeding list
+- BUGFIX: Fixed Alt+3 & Ctrl+F keyboard shortcuts for third tab
 - I18N: Updated Italian, Polish, Portuguese, Brazilian and Spanish translations
 - COSMETIC: Changed the way progress bars are rendered
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 904ab0bf7..e6d8fde02 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -224,6 +224,7 @@ GUI::~GUI(){
   delete connecStatusLblIcon;
   // Keyboard shortcuts
   delete switchSearchShortcut;
+  delete switchSearchShortcut2;
   delete switchDownShortcut;
   delete switchUpShortcut;
   delete switchRSSShortcut;
@@ -258,8 +259,10 @@ void GUI::createKeyboardShortcuts(){
   connect(switchDownShortcut, SIGNAL(activated()), this, SLOT(displayDownTab()));
   switchUpShortcut = new QShortcut(QKeySequence(tr("Alt+2", "shortcut to switch to second tab")), this);
   connect(switchUpShortcut, SIGNAL(activated()), this, SLOT(displayUpTab()));
-  switchSearchShortcut = new QShortcut(QKeySequence(tr("Alt+3, Ctrl+F", "shortcut to switch to third tab (search)")), this);
+  switchSearchShortcut = new QShortcut(QKeySequence(tr("Alt+3", "shortcut to switch to third tab")), this);
   connect(switchSearchShortcut, SIGNAL(activated()), this, SLOT(displaySearchTab()));
+  switchSearchShortcut2 = new QShortcut(QKeySequence(tr("Ctrl+F", "shortcut to switch to search tab")), this);
+  connect(switchSearchShortcut2, SIGNAL(activated()), this, SLOT(displaySearchTab()));
   switchRSSShortcut = new QShortcut(QKeySequence(tr("Alt+4", "shortcut to switch to fourth tab")), this);
   connect(switchRSSShortcut, SIGNAL(activated()), this, SLOT(displayRSSTab()));
   actionTorrent_Properties->setShortcut(QKeySequence("Alt+P"));
diff --git a/src/GUI.h b/src/GUI.h
index a8954477b..6f0db7609 100644
--- a/src/GUI.h
+++ b/src/GUI.h
@@ -76,6 +76,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{
     Qt::SortOrder delayedSortingOrder;
     // Keyboard shortcuts
     QShortcut *switchSearchShortcut;
+    QShortcut *switchSearchShortcut2;
     QShortcut *switchDownShortcut;
     QShortcut *switchUpShortcut;
     QShortcut *switchRSSShortcut;