1 files changed, 6 insertions, 3 deletions
diff --git a/UChecksum.pas b/UChecksum.pas
index 9bd2aaf..c89ae43 100644
--- a/UChecksum.pas
+++ b/UChecksum.pas
@@ -173,7 +173,7 @@ end;
 procedure TFChecksum.FormShow(Sender: TObject);
 begin
   CheckButton.Enabled := FileList.Items.Count > 0;
-  if MD5Present and (not SFVPresent) and (CommentTextView.TextBuffer.LineCount = 1)
+  if MD5Present or {(not SFVPresent) and} (CommentTextView.TextBuffer.CharCount < 1)
     then HPaned.Position := Width - 90;
 end;
 
@@ -448,17 +448,20 @@ begin
   libc_free(Buffer);
   ProgressBar.Fraction := 1;
   CheckButton.Caption := LANGCheckButtonCaptionCheck;
-  if Stop then StatLabel.Caption := LANGChecksumInterrupted else begin
+  if Stop then begin
+    StatLabel.Caption := LANGChecksumInterrupted;
+    CheckButton.SetFocus;
+  end else begin
     Error := 0;
     if List.Count > 0 then
       for i := 0 to List.Count - 1 do
         if TFileListItem(List[i]).Status <> 1 then Inc(Error);
     StatLabel.Caption := Format(LANGChecksumDOK, [Round(100 * (List.Count - Error) / List.Count)]); 
+    ActionArea.SetFocus;
   end;
   StatLabel.UseMarkup := True;
   Stop := False;
   Processing := False;
-  ActionArea.SetFocus;
 end;
 
 procedure TFChecksum.MarkAsBad(const FileName: string);