diff --git a/GUI/GarConvert.cs b/GUI/GarConvert.cs
index 1b5bb240..1531710a 100644
--- a/GUI/GarConvert.cs
+++ b/GUI/GarConvert.cs
@@ -261,6 +261,7 @@ namespace GARbro.GUI
                     m_main.PopupError (m_pending_error.Message, guiStrings.TextMediaConvertError);
             }
             m_main.Activate();
+            m_main.ListViewFocus();
             m_main.RefreshView();
         }
     }
diff --git a/GUI/GarExtract.cs b/GUI/GarExtract.cs
index 3be377db..8201ef7d 100644
--- a/GUI/GarExtract.cs
+++ b/GUI/GarExtract.cs
@@ -419,6 +419,7 @@ namespace GARbro.GUI
             m_extract_in_progress = false;
             m_progress_dialog.Dispose();
             m_main.Activate();
+            m_main.ListViewFocus();
             if (!m_main.ViewModel.IsArchive)
             {
                 m_main.Dispatcher.Invoke (m_main.RefreshView);
diff --git a/GUI/MainWindow.xaml.cs b/GUI/MainWindow.xaml.cs
index 77d87ec3..67f8be07 100644
--- a/GUI/MainWindow.xaml.cs
+++ b/GUI/MainWindow.xaml.cs
@@ -443,7 +443,7 @@ namespace GARbro.GUI
                 lv_SelectItem (ViewModel.Find (name));
         }
 
-        private void lv_Focus ()
+        public void ListViewFocus ()
         {
             if (CurrentDirectory.SelectedIndex != -1)
             {
@@ -747,7 +747,7 @@ namespace GARbro.GUI
             try
             {
                 PushViewModel (GetNewViewModel (path));
-                lv_Focus();
+                ListViewFocus();
             }
             catch (Exception X)
             {