diff --git a/src/data/katepart5ui.rc b/src/data/katepart5ui.rc
--- a/src/data/katepart5ui.rc
+++ b/src/data/katepart5ui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui name="KatePartView" version="78" translationDomain="ktexteditor5">
+<gui name="KatePartView" version="79" translationDomain="ktexteditor5">
 <MenuBar>
   <Menu name="file" noMerge="1"><text>&amp;File</text>
     <Action name="file_save" group="save_merge" />
@@ -122,8 +122,7 @@
     <Action name="tools_cleanIndent" group="tools_operations" />
     <Action name="tools_align" group="tools_operations" />
     <Separator group="tools_operations" />
-    <Action name="tools_comment" group="tools_operations" />
-    <Action name="tools_uncomment" group="tools_operations" />
+    <Action name="tools_toggle_comment" group="tools_operations" />
     <Separator group="tools_operations" />
     <Action name="tools_uppercase" group="tools_operations" />
     <Action name="tools_lowercase" group="tools_operations" />
diff --git a/src/view/kateview.cpp b/src/view/kateview.cpp
--- a/src/view/kateview.cpp
+++ b/src/view/kateview.cpp
@@ -541,6 +541,7 @@
 
         a = ac->addAction(QStringLiteral("tools_toggle_comment"));
         a->setText(i18n("Toggle Comment"));
+        ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::Key_Slash));
         connect(a, SIGNAL(triggered(bool)), SLOT(toggleComment()));
 
         a = m_toggleWriteLock = new KToggleAction(i18n("&Read Only Mode"), this);