diff --git a/apps/browser/MainWindow.cpp b/apps/browser/MainWindow.cpp
index cdf2c6f72..1edc8a606 100644
--- a/apps/browser/MainWindow.cpp
+++ b/apps/browser/MainWindow.cpp
@@ -90,7 +90,10 @@ void MainWindow::deleteServer()
         int sourceId = proxyModel->mapToSource(proxyModel->index(id, ServerData::ADDR)).row();
         favorites->removeRow(sourceId);
         if(favorites->myData.isEmpty())
+        {
             actionPlay->setEnabled(false);
+            actionDelete->setEnabled(false);
+        }
     }
 }
 
@@ -136,7 +139,6 @@ void MainWindow::tabSwitched(int index)
     else
     {
         proxyModel->setSourceModel(favorites);
-        actionDelete->setEnabled(true);
     }
     actionPlay->setEnabled(false);
     actionAdd->setEnabled(false);
@@ -147,6 +149,8 @@ void MainWindow::serverSelected()
     actionPlay->setEnabled(true);
     if(tabWidget->currentIndex() == 0)
         actionAdd->setEnabled(true);
+    if(tabWidget->currentIndex() == 1)
+        actionDelete->setEnabled(true);
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
diff --git a/apps/browser/MySortFilterProxyModel.cpp b/apps/browser/MySortFilterProxyModel.cpp
index 3d50174a1..c5d43685e 100644
--- a/apps/browser/MySortFilterProxyModel.cpp
+++ b/apps/browser/MySortFilterProxyModel.cpp
@@ -30,7 +30,9 @@ bool MySortFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &
 
 MySortFilterProxyModel::MySortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent)
 {
-
+    filterEmpty = false;
+    filterFull = false;
+    maxPing = 0;
 }
 
 void MySortFilterProxyModel::filterEmptyServers(bool state)
diff --git a/files/tes3mp/ui/Main.ui b/files/tes3mp/ui/Main.ui
index 998307d28..c3de17df5 100644
--- a/files/tes3mp/ui/Main.ui
+++ b/files/tes3mp/ui/Main.ui
@@ -235,6 +235,9 @@
    </property>
   </action>
   <action name="actionPlay">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>Play</string>
    </property>