diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index e60b367a..c73ce8da 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -79,6 +79,11 @@ void MainWindow::init()
     ui->dbTreeWidget->setColumnHidden(1, true);
     ui->dbTreeWidget->setColumnWidth(0, 300);
 
+    // Add keyboard shortcuts
+    QList<QKeySequence> shortcuts = ui->actionExecuteSql->shortcuts();
+    shortcuts.push_back(QKeySequence(tr("Ctrl+Return")));
+    ui->actionExecuteSql->setShortcuts(shortcuts);
+
     // Create the actions for the recently opened dbs list
     for(int i = 0; i < MaxRecentFiles; ++i) {
         recentFileActs[i] = new QAction(this);
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 08be0708..68c61c5b 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -1360,6 +1360,9 @@
    <property name="text">
     <string>&amp;Execute SQL</string>
    </property>
+   <property name="toolTip">
+    <string>Execute SQL [F5, Ctrl+Return]</string>
+   </property>
    <property name="shortcut">
     <string>F5</string>
    </property>
@@ -1402,6 +1405,9 @@
    <property name="text">
     <string>Execute current line</string>
    </property>
+   <property name="toolTip">
+    <string>Execute current line [Ctrl+E]</string>
+   </property>
    <property name="shortcut">
     <string>Ctrl+E</string>
    </property>