diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 0e6543a9..af607264 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -3514,6 +3514,15 @@ void MainWindow::openFindReplaceDialog()
         sqlWidget->getEditor()->openFindReplaceDialog();
 }
 
+void MainWindow::toggleSqlBlockComment()
+{
+    // The slot for the shortcut must discover which sqltexedit widget has the focus
+    SqlExecutionArea* sqlWidget = qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->currentWidget());
+
+    if (sqlWidget)
+        sqlWidget->getEditor()->toggleBlockComment();
+}
+
 void MainWindow::openSqlPrintDialog()
 {
     // The slot for the shortcut must discover which sqltexedit widget has the focus and then open its dialog.
diff --git a/src/MainWindow.h b/src/MainWindow.h
index eb6aae18..7d5d82e9 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -304,6 +304,7 @@ private slots:
     void renameSqlTab(int index);
     void setFindFrameVisibility(bool show);
     void openFindReplaceDialog();
+    void toggleSqlBlockComment();
     void openSqlPrintDialog();
     void saveFilterAsView();
     void exportFilteredTable();
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index db61474a..c2c0e1f1 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -946,6 +946,8 @@ You can drag SQL statements from an object row and drop them into other applicat
           <addaction name="separator"/>
           <addaction name="actionSqlFind"/>
           <addaction name="actionSqlFindReplace"/>
+          <addaction name="separator"/>
+          <addaction name="actionSqlToggleComment"/>
          </widget>
         </item>
         <item>
@@ -2364,6 +2366,24 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
     <enum>Qt::WidgetShortcut</enum>
    </property>
   </action>
+  <action name="actionSqlToggleComment">
+   <property name="icon">
+    <iconset resource="icons/icons.qrc">
+     <normaloff>:/icons/comment_block</normaloff>:/icons/comment_block</iconset>
+   </property>
+   <property name="text">
+    <string>Un/comment block of SQL code</string>
+   </property>
+   <property name="toolTip">
+    <string>Comment or uncomment current line or selected block of code</string>
+   </property>
+   <property name="whatsThis">
+    <string>Comment or uncomment the selected lines or the current line, when there is no selection. All the block is toggled according to the first line.</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+/</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
@@ -3777,6 +3797,22 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>actionSqlToggleComment</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>toggleSqlBlockComment()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>518</x>
+     <y>314</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>fileOpen()</slot>
diff --git a/src/icons/comment_block.png b/src/icons/comment_block.png
new file mode 100644
index 00000000..3b3ee4c4
Binary files /dev/null and b/src/icons/comment_block.png differ
diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc
index a253a6ac..82f1b145 100644
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@@ -69,5 +69,6 @@
         <file alias="print">printer.png</file>
         <file alias="project_save">package_save.png</file>
         <file alias="cancel">cancel.png</file>
+        <file alias="comment_block">comment_block.png</file>
     </qresource>
 </RCC>
diff --git a/src/sqltextedit.h b/src/sqltextedit.h
index afba695f..796fd58c 100644
--- a/src/sqltextedit.h
+++ b/src/sqltextedit.h
@@ -22,8 +22,6 @@ public:
 
 public slots:
     void reloadSettings();
-
-private slots:
     void toggleBlockComment();
 
 };