diff --git a/osrepodbmgr.Eto/ChangeLog b/osrepodbmgr.Eto/ChangeLog
index d5adbb4..18b92b6 100644
--- a/osrepodbmgr.Eto/ChangeLog
+++ b/osrepodbmgr.Eto/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-19  Natalia Portillo  <claunia@claunia.com>
+
+	* dlgAdd.xeto.cs:
+	* frmMain.xeto.cs:
+	  Corrected GUI behaviour.
+
 2017-05-19  Natalia Portillo  <claunia@claunia.com>
 
 	* frmMain.xeto.cs:
diff --git a/osrepodbmgr.Eto/dlgAdd.xeto.cs b/osrepodbmgr.Eto/dlgAdd.xeto.cs
index 9373798..e435e7e 100644
--- a/osrepodbmgr.Eto/dlgAdd.xeto.cs
+++ b/osrepodbmgr.Eto/dlgAdd.xeto.cs
@@ -336,7 +336,7 @@ namespace osrepodbmgr.Eto
                 Workers.UpdateProgress2 -= UpdateProgress2;
                 thdHashFiles = null;
 
-                lblProgress.Visible = false;
+                lblProgress.Visible = true;
                 prgProgress.Visible = true;
 
                 thdCheckFiles = new Thread(Workers.CheckDbForFiles);
@@ -1104,8 +1104,7 @@ namespace osrepodbmgr.Eto
                 Workers.UpdateProgress2 -= UpdateProgress2;
                 prgProgress.Indeterminate = true;
 
-                if(thdExtractArchive != null)
-                    thdExtractArchive.Abort();
+                thdExtractArchive = null;
                 thdFindFiles = new Thread(Workers.FindFiles);
                 Workers.Failed += FindFilesFailed;
                 Workers.Finished += FindFilesFinished;
diff --git a/osrepodbmgr.Eto/frmMain.xeto.cs b/osrepodbmgr.Eto/frmMain.xeto.cs
index 851675a..50d588e 100644
--- a/osrepodbmgr.Eto/frmMain.xeto.cs
+++ b/osrepodbmgr.Eto/frmMain.xeto.cs
@@ -747,7 +747,6 @@ namespace osrepodbmgr.Eto
         {
             Application.Instance.Invoke(delegate
             {
-                MessageBox.Show(text, MessageBoxType.Error);
                 treeFiles.Enabled = true;
                 btnToggleCrack.Enabled = true;
                 btnScanWithClamd.Enabled = true;
@@ -759,6 +758,7 @@ namespace osrepodbmgr.Eto
                 lblProgressFiles1.Text = "";
                 if(thdScanFile != null)
                     thdScanFile = null;
+                MessageBox.Show(text, MessageBoxType.Error);
             });
         }
 
diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog
index e658d3c..1853aab 100644
--- a/osrepodbmgr/ChangeLog
+++ b/osrepodbmgr/ChangeLog
@@ -1,3 +1,10 @@
+2017-05-19  Natalia Portillo  <claunia@claunia.com>
+
+	* dlgAdd.cs:
+	* frmMain.cs:
+	* gtk-gui/osrepodbmgr.dlgSettings.cs:
+	  Corrected GUI behaviour.
+
 2017-05-19  Natalia Portillo  <claunia@claunia.com>
 
 	* frmMain.cs:
diff --git a/osrepodbmgr/dlgAdd.cs b/osrepodbmgr/dlgAdd.cs
index 6afc6d3..c7e0eb2 100644
--- a/osrepodbmgr/dlgAdd.cs
+++ b/osrepodbmgr/dlgAdd.cs
@@ -1141,7 +1141,7 @@ public partial class dlgAdd : Dialog
             Workers.UpdateProgress -= UpdateProgress;
             Workers.UpdateProgress2 -= UpdateProgress2;
             if(thdExtractArchive != null)
-                thdExtractArchive.Abort();
+                thdExtractArchive = null;
             if(thdPulseProgress != null)
                 thdPulseProgress.Abort();
             thdPulseProgress = new Thread(() =>
diff --git a/osrepodbmgr/frmMain.cs b/osrepodbmgr/frmMain.cs
index 41cbe91..e206837 100644
--- a/osrepodbmgr/frmMain.cs
+++ b/osrepodbmgr/frmMain.cs
@@ -792,9 +792,6 @@ namespace osrepodbmgr
         {
             Application.Invoke(delegate
             {
-                MessageDialog dlgMsg = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, text);
-                dlgMsg.Run();
-                dlgMsg.Destroy();
                 treeFiles.Sensitive = true;
                 btnToggleCrack.Sensitive = true;
                 btnScanWithClamd.Sensitive = true;
@@ -814,6 +811,9 @@ namespace osrepodbmgr
                     thdScanFile.Abort();
                     thdScanFile = null;
                 }
+                MessageDialog dlgMsg = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, text);
+                dlgMsg.Run();
+                dlgMsg.Destroy();
             });
         }
 
diff --git a/osrepodbmgr/gtk-gui/osrepodbmgr.dlgSettings.cs b/osrepodbmgr/gtk-gui/osrepodbmgr.dlgSettings.cs
index d2cc31e..a49aa78 100644
--- a/osrepodbmgr/gtk-gui/osrepodbmgr.dlgSettings.cs
+++ b/osrepodbmgr/gtk-gui/osrepodbmgr.dlgSettings.cs
@@ -78,7 +78,7 @@ namespace osrepodbmgr
 
 		private global::Gtk.Label GtkLabel8;
 
-		private global::Gtk.Frame frame2;
+		private global::Gtk.Frame frmVirusTotal;
 
 		private global::Gtk.Alignment GtkAlignment7;
 
@@ -467,10 +467,10 @@ namespace osrepodbmgr
 			w39.Expand = false;
 			w39.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
-			this.frame2 = new global::Gtk.Frame();
-			this.frame2.Name = "frame2";
-			this.frame2.ShadowType = ((global::Gtk.ShadowType)(0));
-			// Container child frame2.Gtk.Container+ContainerChild
+			this.frmVirusTotal = new global::Gtk.Frame();
+			this.frmVirusTotal.Name = "frmVirusTotal";
+			this.frmVirusTotal.ShadowType = ((global::Gtk.ShadowType)(0));
+			// Container child frmVirusTotal.Gtk.Container+ContainerChild
 			this.GtkAlignment7 = new global::Gtk.Alignment(0F, 0F, 1F, 1F);
 			this.GtkAlignment7.Name = "GtkAlignment7";
 			this.GtkAlignment7.LeftPadding = ((uint)(12));
@@ -540,14 +540,14 @@ namespace osrepodbmgr
 			w45.Expand = false;
 			w45.Fill = false;
 			this.GtkAlignment7.Add(this.vbox7);
-			this.frame2.Add(this.GtkAlignment7);
+			this.frmVirusTotal.Add(this.GtkAlignment7);
 			this.GtkLabel12 = new global::Gtk.Label();
 			this.GtkLabel12.Name = "GtkLabel12";
 			this.GtkLabel12.LabelProp = global::Mono.Unix.Catalog.GetString("<b>VirusTotal</b>");
 			this.GtkLabel12.UseMarkup = true;
-			this.frame2.LabelWidget = this.GtkLabel12;
-			this.vbox4.Add(this.frame2);
-			global::Gtk.Box.BoxChild w48 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.frame2]));
+			this.frmVirusTotal.LabelWidget = this.GtkLabel12;
+			this.vbox4.Add(this.frmVirusTotal);
+			global::Gtk.Box.BoxChild w48 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.frmVirusTotal]));
 			w48.Position = 2;
 			w48.Expand = false;
 			w48.Fill = false;