2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index c5b26fbf4..4e5277c11 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -603,7 +603,6 @@ sub get_raw_hds {
 
     push @{$all_hds->{raw_hds}}, detect_devices::removables();
     $_->{is_removable} = 1 foreach @{$all_hds->{raw_hds}};
-    $_->{is_removable} = 1 foreach map { partition_table::get_normal_parts($_) } grep { $_->{usb_media_type} } @{$all_hds->{hds}};
 
     get_major_minor(@{$all_hds->{raw_hds}});
 
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 69a6bcb88..ce5c0cdee 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -239,6 +239,10 @@ sub hds {
 	    $_->{device_LABEL} = $label if $label;
 	}
 
+	if ($hd->{usb_media_type}) {
+	    $_->{is_removable} = 1 foreach partition_table::get_normal_parts($hd);
+	}
+
 	push @hds, $hd;
     }