diff --git a/lib/gui/pages/main/controllers/image-selection.js b/lib/gui/pages/main/controllers/image-selection.js
index b12fa090..79c76bd8 100644
--- a/lib/gui/pages/main/controllers/image-selection.js
+++ b/lib/gui/pages/main/controllers/image-selection.js
@@ -83,10 +83,10 @@ module.exports = function(
     Bluebird.try(() => {
       let message = null;
 
-      if (supportedFormats.looksLikeWindowsImage(image)) {
+      if (supportedFormats.looksLikeWindowsImage(image.path)) {
         analytics.logEvent('Possibly Windows image', image);
         message = messages.warning.looksLikeWindowsImage();
-      } else if (supportedFormats.missingPartitionTable(image)) {
+      } else if (!image.hasMBR) {
         analytics.logEvent('Missing partition table', image);
         message = messages.warning.missingPartitionTable();
       }