diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 8b4a1fe61e..a2c5f61b24 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -1641,10 +1641,10 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
 		}
 
 		if (_parent_strip) {
-			if (boost::dynamic_pointer_cast<Send> (_parent_strip->current_delivery()) == send) {
+			if (boost::dynamic_pointer_cast<Send> (_parent_strip->current_delivery()) == internal_send) {
 				_parent_strip->revert_to_default_display ();
 			} else {
-				_parent_strip->show_send (send);
+				_parent_strip->show_send (internal_send);
 			}
 		}
 
diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc
index f36cf6ddb2..1d12cb622b 100644
--- a/libs/gtkmm2ext/pixfader.cc
+++ b/libs/gtkmm2ext/pixfader.cc
@@ -122,6 +122,10 @@ PixFader::on_size_request (GtkRequisition* req)
 bool
 PixFader::on_button_press_event (GdkEventButton* ev)
 {
+	if (ev->type != GDK_BUTTON_PRESS) {
+		return false;
+	}
+	
 	switch (ev->button) {
 	case 1:
 	case 2: