1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 2cf475a53..fbf52a641 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -212,7 +212,7 @@ sub selectLanguage {
 sub selectMouse {
     my ($clicked) = $_[0];
 
-    $o->{mouse} or $o->{mouse} = {};
+    $o->{mouse} ||= {};
     add2hash($o->{mouse}, { mouse::read($o->{prefix}) }) if $o->{isUpgrade} && !$clicked;
 
     $o->selectMouse($clicked);
@@ -327,9 +327,10 @@ sub selectInstallClass {
     $o->{partitions} ||= $suggestedPartitions{$o->{installClass}};
     $o->{partitioning}{auto_allocate} ||= -1 if $::beginner;
 
-    $o->setPackages(\@install_classes) 
-      if $o->{steps}{choosePackages}{entered} >= 1 &&
-	!$o->{steps}{doInstallStep}{done};
+    if ($o->{steps}{choosePackages}{entered} >= 1 && !$o->{steps}{doInstallStep}{done}) {
+        $o->setPackages(\@install_classes);
+        $o->findPackagesToUpgrade() if $o->{isUpgrade};
+    }
 }
 
 #------------------------------------------------------------------------------
@@ -403,6 +404,7 @@ sub formatPartitions {
 #-PADTODO
 sub choosePackages {
     $o->setPackages($o, \@install_classes) if $_[1] == 1;
+    $o->findPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1;
     $o->choosePackages($o->{packages}, $o->{compss});
     $o->{packages}{$_}{selected} = 1 foreach @{$o->{base}};
 }