diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp
--- a/src/lib/app/browserwindow.cpp
+++ b/src/lib/app/browserwindow.cpp
@@ -468,8 +468,11 @@
 
     QShortcut* closeTabAction = new QShortcut(QKeySequence(QSL("Ctrl+W")), this);
     QShortcut* closeTabAction2 = new QShortcut(QKeySequence(QSL("Ctrl+F4")), this);
+    QShortcut* closeTabAction3 = new QShortcut(QKeySequence(QSL("Ctrl+Q")), this);
     connect(closeTabAction, SIGNAL(activated()), this, SLOT(closeTab()));
     connect(closeTabAction2, SIGNAL(activated()), this, SLOT(closeTab()));
+    connect(closeTabAction3, SIGNAL(activated()), this, SLOT(closeTab()));
+
 
     QShortcut* reloadAction = new QShortcut(QKeySequence(QSL("Ctrl+R")), this);
     connect(reloadAction, SIGNAL(activated()), this, SLOT(reload()));
@@ -602,8 +605,8 @@
 
     settings.beginGroup(QSL("Web-Browser-Settings"));
     QAction *quitAction = m_mainMenu->action(QSL("Standard/Quit"));
-    if (settings.value(QSL("closeAppWithCtrlQ"), true).toBool()) {
-        quitAction->setShortcut(QzTools::actionShortcut(QKeySequence::Quit, QKeySequence(QSL("Ctrl+Q"))));
+    if (settings.value(QSL("closeTabWithCtrlQ"), false).toBool()) {
+       quitAction->setShortcut(QzTools::actionShortcut(QKeySequence::Quit, QKeySequence(QSL("Ctrl+Q"))));
     } else {
         quitAction->setShortcut(QKeySequence());
     }
@@ -1386,6 +1389,14 @@
         }
         break;
 
+    case Qt::Key_Q:
+        if (event->modifiers() == Qt::ControlModifier) {
+            action(QSL("QuitTab"))->trigger();
+            event->accept();
+        }
+        break;
+
+
     case Qt::Key_F:
         if (event->modifiers() == Qt::ControlModifier) {
             action(QSL("Edit/Find"))->trigger();