diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc
index 2caba4553..c8fb56a63 100644
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -281,9 +281,15 @@ FramesData::FramesData(const Glib::ustring &fname) :
 
         if (find_tag(Exiv2::lensName)) {
             lens = validateUft8(pos->print(&exif)); // validateUft8 (#5923) still needed?
-            if (pos->count() == 1 && lens == std::to_string(pos->toLong()) &&
-                find_exif_tag("Exif.Photo.LensModel")) {
+            auto p = pos;
+            if (find_exif_tag("Exif.CanonFi.RFLensType") && find_exif_tag("Exif.Canon.LensModel")) {
                 lens = validateUft8(pos->print(&exif)); // validateUft8 (#5923) still needed?
+                if (Glib::ustring(lens).lowercase().find("canon") == Glib::ustring::npos) {
+                    lens = std::string("Canon ") + lens;
+                }
+            } else if (p->count() == 1 && lens == std::to_string(p->toLong()) &&
+                find_exif_tag("Exif.Photo.LensModel")) {
+                lens = validateUft8(p->print(&exif)); // validateUft8 (#5923) still needed?
             }
         } else if (find_exif_tag("Exif.Photo.LensSpecification") && pos->count() == 4) {
             const auto round =