diff --git a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
index 0c8f507..6f79d93 100644
--- a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
@@ -228,6 +228,15 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             }
             return false;
         }
+
+        @Override
+        public void onResume() {
+            setPreferenceScreen(null);
+            addPreferencesFromResource(R.xml.pref_general);
+            bindPreferenceSummaryToValue(findPreference("pref_api_base"));
+
+            super.onResume();
+        }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
index d4950e9..8a68ce6 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
@@ -128,8 +128,8 @@ public class VideoListActivity extends CommonActivity {
         menu.findItem(R.id.action_account).setIcon(
                 new IconicsDrawable(this, FontAwesome.Icon.faw_user_circle).actionBar());
 
-        menu.findItem(R.id.action_server_selection).setIcon(
-                new IconicsDrawable(this, FontAwesome.Icon.faw_server).actionBar());
+//        menu.findItem(R.id.action_server_selection).setIcon(
+//                new IconicsDrawable(this, FontAwesome.Icon.faw_server).actionBar());
 
         MenuItem searchMenuItem = menu.findItem(R.id.action_search);
 
@@ -203,10 +203,10 @@ public class VideoListActivity extends CommonActivity {
                     this.startActivity(intentMe);
                 }
                 return false;
-            case R.id.action_server_selection:
-                Intent intentServer = new Intent(this, SelectServerActivity.class);
-                this.startActivity(intentServer);
-                return false;
+//            case R.id.action_server_selection:
+//                Intent intentServer = new Intent(this, SelectServerActivity.class);
+//                this.startActivity(intentServer);
+//                return false;
             default:
                 break;
         }
diff --git a/app/src/main/res/menu/menu_top_videolist.xml b/app/src/main/res/menu/menu_top_videolist.xml
index e8a536e..3671565 100644
--- a/app/src/main/res/menu/menu_top_videolist.xml
+++ b/app/src/main/res/menu/menu_top_videolist.xml
@@ -26,11 +26,11 @@
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
         app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/action_server_selection"
-        android:orderInCategory="300"
-        android:title="@string/action_bar_title_server_selection"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-        app:showAsAction="ifRoom" />
+    <!--<item-->
+        <!--android:id="@+id/action_server_selection"-->
+        <!--android:orderInCategory="300"-->
+        <!--android:title="@string/action_bar_title_server_selection"-->
+        <!--android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"-->
+        <!--app:showAsAction="ifRoom" />-->
 
 </menu>
\ No newline at end of file