diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index cf179cb86c..c169a83146 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -682,14 +682,6 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
 		_feedback_interval = 10000;
 	}
 
-	if (!node.get_property ("threshold", _threshold)) {
-		_threshold = 10;
-	}
-
-	if (!node.get_property ("motorized", _motorised)) {
-		_motorised = false;
-	}
-
 	boost::shared_ptr<Controllable> c;
 
 	{
@@ -715,6 +707,15 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
 		}
 	}
 
+	/* Restore any custom settings which may have been overwritten by load_bindings */
+	if (!node.get_property ("threshold", _threshold)) {
+		_threshold = 10;
+	}
+
+	if (!node.get_property ("motorized", _motorised)) {
+		_motorised = false;
+	}
+
 	/* Load up specific bindings from the
 	 * <Controls><MidiControllable>...</MidiControllable><Controls> section
 	 */
diff --git a/libs/surfaces/generic_midi/gmcp_gui.cc b/libs/surfaces/generic_midi/gmcp_gui.cc
index b9e4239859..7b8337c756 100644
--- a/libs/surfaces/generic_midi/gmcp_gui.cc
+++ b/libs/surfaces/generic_midi/gmcp_gui.cc
@@ -241,8 +241,6 @@ GMCPGUI::GMCPGUI (GenericMidiControlProtocol& p)
 
 	pack_start (*table, false, false);
 
-	binding_changed ();
-
 	/* update the port connection combos */
 
 	update_port_combos ();