diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade
index e25e8b99..436098e9 100644
--- a/veejay-current/veejay-client/share/gveejay.reloaded.glade
+++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade
@@ -4167,7 +4167,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip" translatable="yes">Toggle keyframing for this chain entry</property>
+                                    <property name="tooltip" translatable="yes">Toggle keyframe animation for this parameter</property>
                                     <signal name="toggled" handler="on_curve_toggleentry_param_toggled" />
                                     <child>
                                       <widget class="GtkImage" id="image2146">
diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c
index bbcc5ed2..df360413 100644
--- a/veejay-current/veejay-client/src/callback.c
+++ b/veejay-current/veejay-client/src/callback.c
@@ -2747,6 +2747,7 @@ void	on_kf_none_toggled( GtkWidget widget, gpointer user_data)
 	info->uc.selected_parameter_id = -1;
 	
 	disable_widget( "fxanimcontrols" );
+	disable_widget( "curve" );
 
 	if(info->status_lock)
 		return;
diff --git a/veejay-current/veejay-client/src/curve.c b/veejay-current/veejay-client/src/curve.c
index 074134f4..642715e2 100644
--- a/veejay-current/veejay-client/src/curve.c
+++ b/veejay-current/veejay-client/src/curve.c
@@ -31,6 +31,7 @@ void	get_points_from_curve( GtkWidget *curve, int len, float *vec )
 
 void	reset_curve( GtkWidget *curve )
 {
+	gtk_widget_set_sensitive( GTK_WIDGET(curve), TRUE );
 	gtk_curve_reset(GTK_CURVE(curve));
 	gtk_curve_set_range( GTK_CURVE(curve), 0.0, 1.0, 0.0, 1.0 );
 }
diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c
index 51b857c0..584ce197 100644
--- a/veejay-current/veejay-client/src/vj-api.c
+++ b/veejay-current/veejay-client/src/vj-api.c
@@ -2429,7 +2429,6 @@ static void vj_kf_select_parameter(int num)
 	gchar *name = _utf8str(_effect_get_param_description(entry_tokens[ENTRY_FXID],info->uc.selected_parameter_id));
 	update_label_str( "curve_parameter", name );
 	g_free(name);
-	set_toggle_button( "curve_toggleentry", entry_tokens[ENTRY_KF_STATUS]);
 
 	reset_curve( glade_xml_get_widget_(info->main_window, "curve"));