diff --git a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPageController.nas b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPageController.nas
index 97d3f1d1a..ebe32b8dc 100644
--- a/Aircraft/Instruments-3d/FG1000/Nasal/MFDPageController.nas
+++ b/Aircraft/Instruments-3d/FG1000/Nasal/MFDPageController.nas
@@ -112,8 +112,8 @@ RegisterWithEmesary : func()
     var controller = me;
     me._recipient.Receive = func(notification)
     {
-      if (notification.Device_Id == pfd_obj.device_id
-          and notification.NotificationType == notifications.PFDEventNotification.DefaultType) {
+      if (notification.NotificationType == notifications.PFDEventNotification.DefaultType and
+          notification.Device_Id == pfd_obj.device_id) {
         if (notification.Event_Id == notifications.PFDEventNotification.HardKeyPushed
             and notification.EventParameter != nil)
         {
diff --git a/Nasal/canvas/MFD_Generic.nas b/Nasal/canvas/MFD_Generic.nas
index 218b3e374..4921bd5d6 100644
--- a/Nasal/canvas/MFD_Generic.nas
+++ b/Nasal/canvas/MFD_Generic.nas
@@ -219,8 +219,8 @@ var PFD_Device =
             var pfd_obj = me;
             me.Recipient.Receive = func(notification)
               {
-                  if (notification.Device_Id == pfd_obj.device_id
-                      and notification.NotificationType == notifications.PFDEventNotification.DefaultType) {
+                  if (notification.NotificationType == notifications.PFDEventNotification.DefaultType and
+                      notification.Device_Id == pfd_obj.device_id) {
                       if (notification.Event_Id == notifications.PFDEventNotification.SoftKeyPushed
                           and notification.EventParameter != nil)
                         {