diff --git a/libs/surfaces/faderport8/actions.cc b/libs/surfaces/faderport8/actions.cc
index 6389e4a3ac..d17059d92d 100644
--- a/libs/surfaces/faderport8/actions.cc
+++ b/libs/surfaces/faderport8/actions.cc
@@ -90,6 +90,7 @@ FaderPort8::setup_actions ()
 	BindFunction (BtnATouch, released, button_automation, ARDOUR::Touch);
 	BindFunction (BtnARead, released, button_automation, ARDOUR::Play);
 	BindFunction (BtnAWrite, released, button_automation, ARDOUR::Write);
+	BindFunction (BtnALatch, released, button_automation, ARDOUR::Latch);
 
 	_ctrls.button (FP8Controls::BtnEncoder).pressed.connect_same_thread (button_connections, boost::bind (&FaderPort8::button_encoder, this));
 	_ctrls.button (FP8Controls::BtnParam).pressed.connect_same_thread (button_connections, boost::bind (&FaderPort8::button_parameter, this));
diff --git a/libs/surfaces/faderport8/callbacks.cc b/libs/surfaces/faderport8/callbacks.cc
index f9a7d4976a..fd5d1407cb 100644
--- a/libs/surfaces/faderport8/callbacks.cc
+++ b/libs/surfaces/faderport8/callbacks.cc
@@ -100,6 +100,7 @@ FaderPort8::notify_automation_mode_changed ()
 	_ctrls.button (FP8Controls::BtnATouch).set_active (as == Touch);
 	_ctrls.button (FP8Controls::BtnARead).set_active (as == Play);
 	_ctrls.button (FP8Controls::BtnAWrite).set_active (as == Write);
+	_ctrls.button (FP8Controls::BtnALatch).set_active (as == Latch);
 }
 
 void
diff --git a/libs/surfaces/faderport8/fp8_controls.cc b/libs/surfaces/faderport8/fp8_controls.cc
index 0920cc535b..7ce1dfe5d4 100644
--- a/libs/surfaces/faderport8/fp8_controls.cc
+++ b/libs/surfaces/faderport8/fp8_controls.cc
@@ -233,13 +233,12 @@ FP8Controls::initialize ()
 	button (BtnARead).set_color (0x00ff00ff);
 	button (BtnAWrite).set_color (0xff0000ff);
 	button (BtnATouch).set_color (0xff8800ff);
+	button (BtnALatch).set_color (0xffff00ff);
 
 	button (BtnUser1).set_color (0x0000ffff);
 	button (BtnUser2).set_color (0x0000ffff);
 	button (BtnUser3).set_color (0x0000ffff);
 
-	button (BtnALatch).set_color (0x0000ffff);
-
 	button (BtnBypass).set_color (0x888888ff);
 	button (BtnBypassAll).set_color (0xffffffff);