diff --git a/components/onlinepackagemanager/opkman_mainfrm.pas b/components/onlinepackagemanager/opkman_mainfrm.pas
index f9133f5239..0749b02853 100644
--- a/components/onlinepackagemanager/opkman_mainfrm.pas
+++ b/components/onlinepackagemanager/opkman_mainfrm.pas
@@ -273,7 +273,10 @@ begin
   begin
     if AResolveDependencies then
       if VisualTree.ResolveDependencies = mrCancel then
+      begin
+        Result := False;
         Exit;
+      end;
     VisualTree.GetPackageList;
     VisualTree.UpdatePackageStates;
   end
diff --git a/components/onlinepackagemanager/opkman_visualtree.pas b/components/onlinepackagemanager/opkman_visualtree.pas
index ece44404db..ffdefd6981 100644
--- a/components/onlinepackagemanager/opkman_visualtree.pas
+++ b/components/onlinepackagemanager/opkman_visualtree.pas
@@ -1288,9 +1288,9 @@ begin
                       Result := MessageDlgEx(Msg, mtConfirmation, [mbYes, mbYesToAll, mbNo, mbNoToAll, mbCancel], TForm(FVST.Parent.Parent));
                       if Result in [mrNo, mrNoToAll] then
                         if MessageDlgEx(rsMainFrm_rsPackageDependency1, mtInformation, [mbYes, mbNo], TForm(FVST.Parent.Parent)) <> mrYes then
-                          Exit;
+                          Exit(mrCancel);
                       if (Result = mrNoToAll) or (Result = mrCancel) then
-                        Exit;
+                        Exit(mrCancel);
                     end;
                     if Result in [mrYes, mrYesToAll] then
                     begin