diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h
index e42d3690e..54c444fc5 100644
--- a/include/SampleBuffer.h
+++ b/include/SampleBuffer.h
@@ -174,7 +174,8 @@ public:
 
     QString openAudioFile() const;
     QString openAndSetAudioFile();
-
+	QString openAndSetWaveformFile();
+	
 	QString & toBase64( QString & _dst ) const;
 
 
diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp
index d675b7b83..0b91fba22 100644
--- a/plugins/triple_oscillator/TripleOscillator.cpp
+++ b/plugins/triple_oscillator/TripleOscillator.cpp
@@ -138,7 +138,7 @@ OscillatorObject::~OscillatorObject()
 
 void OscillatorObject::oscUserDefWaveDblClick()
 {
-	QString af = m_sampleBuffer->openAndSetAudioFile();
+	QString af = m_sampleBuffer->openAndSetWaveformFile();
 	if( af != "" )
 	{
 		// TODO:
diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
index 674a0a101..543be8923 100644
--- a/src/core/SampleBuffer.cpp
+++ b/src/core/SampleBuffer.cpp
@@ -908,6 +908,23 @@ QString SampleBuffer::openAndSetAudioFile()
 }
 
 
+QString SampleBuffer::openAndSetWaveformFile()
+{
+	if( m_audioFile.isEmpty() )
+	{
+		m_audioFile = configManager::inst()->factorySamplesDir() + "waveforms/10saw.flac";
+	}
+	
+	QString fileName = this->openAudioFile();
+
+	if(!fileName.isEmpty())
+	{
+		this->setAudioFile( fileName );
+	}
+
+	return fileName;	
+}
+
 
 
 #undef LMMS_HAVE_FLAC_STREAM_ENCODER_H	/* not yet... */
diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp
index 3aa9f7c0a..03b0b2d01 100644
--- a/src/gui/LfoControllerDialog.cpp
+++ b/src/gui/LfoControllerDialog.cpp
@@ -252,7 +252,7 @@ void LfoControllerDialog::askUserDefWave()
 {
 	SampleBuffer * sampleBuffer = dynamic_cast<LfoController*>(this->model())->
 									m_userDefSampleBuffer;
-	QString fileName = sampleBuffer->openAndSetAudioFile();
+	QString fileName = sampleBuffer->openAndSetWaveformFile();
 	if( fileName.isEmpty() == false )
 	{
 		// TODO:
diff --git a/src/gui/widgets/graph.cpp b/src/gui/widgets/graph.cpp
index 9a4347647..dc0246eb0 100644
--- a/src/gui/widgets/graph.cpp
+++ b/src/gui/widgets/graph.cpp
@@ -485,7 +485,7 @@ void graphModel::setWaveToNoise()
 QString graphModel::setWaveToUser()
 {
 	SampleBuffer * sampleBuffer = new SampleBuffer;
-	QString fileName = sampleBuffer->openAndSetAudioFile();
+	QString fileName = sampleBuffer->openAndSetWaveformFile();
 	if( fileName.isEmpty() == false )
 	{
 		for( int i = 0; i < length(); i++ )