diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp
index 3e97ccb..016fa04 100644
--- a/Source/PluginEditor.cpp
+++ b/Source/PluginEditor.cpp
@@ -60,8 +60,8 @@ PaulstretchpluginAudioProcessorEditor::PaulstretchpluginAudioProcessorEditor(Pau
 	setSize (1000, 30+(pars.size()/2)*25+200);
 	m_wavecomponent.TimeSelectionChangedCallback = [this](Range<double> range, int which)
 	{
-		*processor.getFloatParameter(5) = range.getStart();
-		*processor.getFloatParameter(6) = range.getEnd();
+		*processor.getFloatParameter(cpi_soundstart) = range.getStart();
+		*processor.getFloatParameter(cpi_soundend) = range.getEnd();
 	};
 	m_wavecomponent.CursorPosCallback = [this]()
 	{
@@ -503,8 +503,8 @@ void WaveformComponent::mouseDown(const MouseEvent & e)
 		m_drag_time_start = pos;
 		if (m_time_sel_drag_target == 0)
 		{
-			m_time_sel_start = -1.0;
-			m_time_sel_end = -1.0;
+			//m_time_sel_start = 0.0;
+			//m_time_sel_end = 1.0;
 		}
 	}
 
@@ -574,6 +574,14 @@ void WaveformComponent::mouseMove(const MouseEvent & e)
 
 }
 
+void WaveformComponent::mouseDoubleClick(const MouseEvent & e)
+{
+	m_time_sel_start = 0.0;
+	m_time_sel_end = 1.0;
+	TimeSelectionChangedCallback({ 0.0,1.0 }, 0);
+	repaint();
+}
+
 Range<double> WaveformComponent::getTimeSelection()
 {
 	if (m_time_sel_start >= 0.0 && m_time_sel_end>m_time_sel_start + 0.001)
diff --git a/Source/PluginEditor.h b/Source/PluginEditor.h
index aba7b1b..986b740 100644
--- a/Source/PluginEditor.h
+++ b/Source/PluginEditor.h
@@ -95,6 +95,7 @@ public:
 	void mouseUp(const MouseEvent& e) override;
 	void mouseDrag(const MouseEvent& e) override;
 	void mouseMove(const MouseEvent& e) override;
+	void mouseDoubleClick(const MouseEvent& e) override;
 	Range<double> getTimeSelection();
 	void setTimeSelection(Range<double> rng);
 	void setFileCachedRange(std::pair<Range<double>, Range<double>> rng);