diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp
index 15f00fa3b..acdfe9444 100644
--- a/src/musrgui/PTextEdit.cpp
+++ b/src/musrgui/PTextEdit.cpp
@@ -208,6 +208,11 @@ void PTextEdit::setupEditActions()
   connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
   a->addTo( tb );
   a->addTo( menu );
+  menu->insertSeparator();
+  a = new QAction( tr( "(Un)Co&mment" ), CTRL + Key_M, this, "editComment" );
+  connect( a, SIGNAL( activated() ), this, SLOT( editComment() ) );
+  a->addTo( tb );
+  a->addTo( menu );
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -631,6 +636,64 @@ void PTextEdit::editPaste()
   currentEditor()->paste();
 }
 
+//----------------------------------------------------------------------------------------------------
+/**
+ * <p>
+ */
+void PTextEdit::editComment()
+{
+  if ( !currentEditor() )
+    return;
+
+  QString str;
+  if (currentEditor()->hasSelectedText()) { // selected text present
+    int paraFrom, paraTo;
+    int indexFrom, indexTo;
+    // get selection
+    currentEditor()->getSelection(&paraFrom, &indexFrom, &paraTo, &indexTo);
+    // check that indexFrom == 0, if not change the selection accordingly
+    if (indexFrom != 0) {
+      indexFrom = 0;
+      currentEditor()->setSelection(paraFrom, indexFrom, paraTo, indexTo);
+    }
+    // check that indexTo == end of line of paraTo
+    if (indexTo != (int)currentEditor()->text(paraTo).length()) {
+      indexTo = currentEditor()->text(paraTo).length();
+      currentEditor()->setSelection(paraFrom, indexFrom, paraTo, indexTo);
+    }
+    // get selection text
+    str = currentEditor()->selectedText();
+    // check line by line if (un)comment is needed
+    QStringList strList = QStringList::split("\n", str);
+    for (QStringList::Iterator it = strList.begin(); it != strList.end(); ++it) {
+      if ((*it).stripWhiteSpace().startsWith("#")) { // comment -> uncomment it
+        (*it).remove(0,1);
+        (*it) = (*it).stripWhiteSpace();
+      } else { // no comment -> comment it
+        (*it).prepend("# ");
+      }
+    }
+    str = strList.join("\n");
+    currentEditor()->insert(str);
+  } else { // no text selected
+    int para, index;
+    currentEditor()->getCursorPosition(&para, &index);
+    // get current text line
+    str = currentEditor()->text(para);
+    // check if it is a comment line or not
+    if (str.stripWhiteSpace().startsWith("#")) { // comment -> uncomment it
+      str.remove(0,1);
+      str = str.stripWhiteSpace();
+    } else { // no comment -> comment it
+      str.prepend("# ");
+    }
+    // select current line
+    currentEditor()->setSelection(para, 0, para, currentEditor()->text(para).length());
+    // insert altered text
+    currentEditor()->insert(str);
+  }
+}
+
 //----------------------------------------------------------------------------------------------------
 /**
  * <p>
diff --git a/src/musrgui/PTextEdit.h b/src/musrgui/PTextEdit.h
index 9b5723397..da40ae6b8 100644
--- a/src/musrgui/PTextEdit.h
+++ b/src/musrgui/PTextEdit.h
@@ -76,6 +76,7 @@ private slots:
   void editCut();
   void editCopy();
   void editPaste();
+  void editComment();
 
   void textFamily( const QString &f );
   void textSize( const QString &p );