diff --git a/include/MidiClip.h b/include/MidiClip.h
index 076ec93b0..d8553e87e 100644
--- a/include/MidiClip.h
+++ b/include/MidiClip.h
@@ -99,6 +99,7 @@ public:
 	MidiClip * nextMidiClip() const;
 
 	// settings-management
+	void exportToXML(QDomDocument& doc, QDomElement& midiClipElement, bool onlySelectedNotes = false);
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;
 	void loadSettings( const QDomElement & _this ) override;
 	inline QString nodeName() const override
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 3ef056c43..89789937f 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -28,6 +28,8 @@
 
 #include <QtMath>
 #include <QApplication>
+#include <QCheckBox>
+#include <QGridLayout>
 #include <QHBoxLayout>
 #include <QInputDialog>
 #include <QKeyEvent>
@@ -5476,6 +5478,14 @@ void PianoRollWindow::exportMidiClip()
 	FileDialog exportDialog(this, tr("Export clip"), "",
 		tr("XML clip file (*.xpt *.xptz)"));
 
+	auto layout = dynamic_cast<QGridLayout*>(exportDialog.layout());
+	QCheckBox* onlySelectedNotesCheckBox = nullptr;
+	if (layout)
+	{
+		onlySelectedNotesCheckBox = new QCheckBox(tr("Export only selected notes"), &exportDialog);
+		layout->addWidget(onlySelectedNotesCheckBox);
+	}
+
 	exportDialog.setAcceptMode(FileDialog::AcceptSave);
 
 	if (exportDialog.exec() == QDialog::Accepted &&
@@ -5489,8 +5499,14 @@ void PianoRollWindow::exportMidiClip()
 		exportDialog.setDefaultSuffix(suffix);
 
 		const QString fullPath = exportDialog.selectedFiles()[0];
+
+		// Check if only the selected notes should be exported
+		auto* midiClip = m_editor->m_midiClip;
+
+		const bool onlySelectedNotes = onlySelectedNotesCheckBox && onlySelectedNotesCheckBox->isChecked();
+
 		DataFile dataFile(DataFile::Type::MidiClip);
-		m_editor->m_midiClip->saveSettings(dataFile, dataFile.content());
+		midiClip->exportToXML(dataFile, dataFile.content(), onlySelectedNotes);
 
 		if (dataFile.writeFile(fullPath))
 		{
diff --git a/src/tracks/MidiClip.cpp b/src/tracks/MidiClip.cpp
index b422be824..707cbaf3d 100644
--- a/src/tracks/MidiClip.cpp
+++ b/src/tracks/MidiClip.cpp
@@ -442,43 +442,50 @@ void MidiClip::checkType()
 }
 
 
-
-
-void MidiClip::saveSettings( QDomDocument & _doc, QDomElement & _this )
+void MidiClip::exportToXML(QDomDocument& doc, QDomElement& midiClipElement, bool onlySelectedNotes)
 {
-	_this.setAttribute( "type", static_cast<int>(m_clipType) );
-	_this.setAttribute( "name", name() );
-	_this.setAttribute("autoresize", QString::number(getAutoResize()));
-	_this.setAttribute("off", startTimeOffset());
+	midiClipElement.setAttribute("type", static_cast<int>(m_clipType));
+	midiClipElement.setAttribute("name", name());
+	midiClipElement.setAttribute("autoresize", QString::number(getAutoResize()));
+	midiClipElement.setAttribute("off", startTimeOffset());
 	
 	if (const auto& c = color())
 	{
-		_this.setAttribute("color", c->name());
+		midiClipElement.setAttribute("color", c->name());
 	}
 	// as the target of copied/dragged MIDI clip is always an existing
 	// MIDI clip, we must not store actual position, instead we store -1
 	// which tells loadSettings() not to mess around with position
-	if( _this.parentNode().nodeName() == "clipboard" ||
-			_this.parentNode().nodeName() == "dnddata" )
+	if (midiClipElement.parentNode().nodeName() == "clipboard" ||
+			midiClipElement.parentNode().nodeName() == "dnddata")
 	{
-		_this.setAttribute( "pos", -1 );
+		midiClipElement.setAttribute("pos", -1);
 	}
 	else
 	{
-		_this.setAttribute( "pos", startPosition() );
+		midiClipElement.setAttribute("pos", startPosition());
 	}
-	_this.setAttribute( "muted", isMuted() );
-	_this.setAttribute( "steps", m_steps );
-	_this.setAttribute( "len", length() );
+	midiClipElement.setAttribute("muted", isMuted());
+	midiClipElement.setAttribute("steps", m_steps);
+	midiClipElement.setAttribute("len", length());
 
 	// now save settings of all notes
 	for (auto& note : m_notes)
 	{
-		note->saveState(_doc, _this);
+		if (!onlySelectedNotes || note->selected())
+		{
+			note->saveState(doc, midiClipElement);
+		}
 	}
 }
 
 
+void MidiClip::saveSettings( QDomDocument & _doc, QDomElement & _this )
+{
+	exportToXML(_doc, _this);
+}
+
+
 
 
 void MidiClip::loadSettings( const QDomElement & _this )