@@ -175,13 +175,19 @@ displayClass.MFD = {

                 me.device.knobs.FmsOuter = me.device.knobs.MFD_select_page_group;

             }

             me.device.buttons.ENT = func (a = 0) {

-                a or return;

+                if (a) return;

                 var (id, selected) = split('-', me.device.windows.selected);

                 var file = me.device.windows.state[id].objects[selected]._file;

                 me.device.buttons.CLR();

                 data.flightplan = flightplan(file);

                 data.flightplan.activate();

                 fgcommand("activate-flightplan", props.Node.new({"activate": 1}));

+                foreach (var d; keys(zkv1000.flightdeck)) {

+                    if (zkv1000.flightdeck[d].role == 'MFD')

+                        zkv1000.flightdeck[d].softkeys.colored.MAPROUTE = 1;

+                    if (zkv1000.flightdeck[d].role == 'PFD')

+                        zkv1000.flightdeck[d].softkeys.colored.INSETROUTE = 1;

+                }

             }

         },

     },

@@ -211,11 +211,6 @@ var MapRoute = {

         m.flightPlan = [];

         m.currentWpIndex = getprop('/autopilot/route-manager/current-wp');

-        if (m.device.role == 'PFD')

-            m.device.softkeys.colored.INSETROUTE = 1;

-        if (m.device.role == 'MFD')

-            m.device.softkeys.colored.MAPROUTE = 1;

-

         return m;

     },

     off: func {