diff --git a/ChangeLog b/ChangeLog
index 3ed4fd258e..97cabd9ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-07	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/gui/effect_select_dialog.cpp:
+	fixed wrong model-index (=>wrong description-widget) when filtering
+
 	* src/gui/lmms_style.cpp:
 	decreased button-icon-size to 20px
 
diff --git a/src/gui/effect_select_dialog.cpp b/src/gui/effect_select_dialog.cpp
index 6c7d14c9d8..5e208d8f78 100644
--- a/src/gui/effect_select_dialog.cpp
+++ b/src/gui/effect_select_dialog.cpp
@@ -251,7 +251,12 @@ void effectListWidget::rowChanged( const QModelIndex & _idx,
 	delete m_descriptionWidget;
 	m_descriptionWidget = NULL;
 
-	m_currentSelection = m_effectKeys[_idx.row()];
+	if( m_model.mapToSource( _idx ).row() < 0 )
+	{
+		return;
+	}
+
+	m_currentSelection = m_effectKeys[m_model.mapToSource( _idx ).row()];
 	if( m_currentSelection.desc &&
 				m_currentSelection.desc->sub_plugin_features )
 	{