diff --git a/app/src/main/java/org/kiwix/kiwixmobile/webserver/StartServer.java b/app/src/main/java/org/kiwix/kiwixmobile/webserver/StartServer.java
index 5e2d35763..430965fc1 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/webserver/StartServer.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/webserver/StartServer.java
@@ -14,12 +14,12 @@ public class StartServer extends AppCompatActivity {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_start_server);
+    setUpToolbar();
     FragmentManager fragmentManager = getSupportFragmentManager();
     FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
     ZimFileSelectFragment fragment = new ZimFileSelectFragment();
     fragmentTransaction.add(R.id.frameLayoutServer, fragment);
     fragmentTransaction.commit();
-    setUpToolbar();
   }
 
   private void setUpToolbar() {
diff --git a/app/src/main/res/layout/activity_start_server.xml b/app/src/main/res/layout/activity_start_server.xml
index 77ec7b0b1..eacc77a22 100644
--- a/app/src/main/res/layout/activity_start_server.xml
+++ b/app/src/main/res/layout/activity_start_server.xml
@@ -5,6 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:id="@+id/constraintLayoutId"
     tools:context=".webserver.StartServer"
     >
@@ -38,7 +39,7 @@
         android:layout_marginTop="16dp"
         android:textAlignment="center"
         android:text="@string/server_textview_default_message"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout2"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
         />
 
     <FrameLayout
@@ -47,8 +48,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         app:layout_constraintTop_toBottomOf="@+id/textView"
-        tools:layout_editor_absoluteX="0dp"
-        ></FrameLayout>
+        />
 
   </LinearLayout>