diff --git a/ide/packages/idepackager/packagesystem.pas b/ide/packages/idepackager/packagesystem.pas
index eec8eb5c24..742b247dad 100644
--- a/ide/packages/idepackager/packagesystem.pas
+++ b/ide/packages/idepackager/packagesystem.pas
@@ -3664,7 +3664,7 @@ begin
     Result:=CheckIfCurPkgOutDirNeedsCompile(APackage,
                true,SkipDesignTimePackages,GroupCompile,
                NeedBuildAllFlag,ConfigChanged,DependenciesChanged,Note);
-    if Result=mrNo then begin
+    if Result in [mrNo, mrCancel] then begin
       // the current output is valid
       exit;
     end;
@@ -3729,7 +3729,7 @@ begin
     DefResult:=CheckIfCurPkgOutDirNeedsCompile(APackage,
                  true,SkipDesignTimePackages,GroupCompile,
                  NeedBuildAllFlag,ConfigChanged,DependenciesChanged,Note);
-    if IsDefDirWritable or (DefResult=mrNo) then begin
+    if IsDefDirWritable or (DefResult in [mrNo, mrCancel]) then begin
       // switching back to the default output directory
       debugln(['Hint: (lazarus) switching back to the normal output directory: "',APackage.GetOutputDirectory,'" Package ',APackage.IDAsString]);
       Note+='Switching back to default output directory.'+LineEnding;
@@ -4484,7 +4484,7 @@ begin
     if Note<>'' then
       Note:='Compile reason: '+Note;
     if (pcfOnlyIfNeeded in Flags) then begin
-      if Result=mrNo then begin
+      if Result in [mrNo, mrCancel] then begin
         //DebugLn(['TLazPackageGraph.CompilePackage ',APackage.IDAsString,' does not need compilation.']);
         Result:=mrOk;
         exit;
diff --git a/tools/lazdatadesktop/frmmain.pp b/tools/lazdatadesktop/frmmain.pp
index b98ee9c299..a55187b734 100644
--- a/tools/lazdatadesktop/frmmain.pp
+++ b/tools/lazdatadesktop/frmmain.pp
@@ -1514,7 +1514,7 @@ procedure TMainForm.DoImport(const EngineName, ConnectionString: String);
   Function UseNewDataDict : Boolean;
   
   begin
-    Result:=(mrNo=QuestionDLG(SImportDictInto,SWhichCurrentDictToUse,mtInformation,[mrYes,SUseCurrentDict,mrNo,SUseNewDict],0))
+    Result:=mrYes<>QuestionDlg(SImportDictInto,SWhichCurrentDictToUse,mtInformation,[mrYes,SUseCurrentDict,mrNo,SUseNewDict],0);
   end;
 
 Var