diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index 71b60aa83..cfe2d11a9 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -455,6 +455,9 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     backToTopButton.hide();
     tabSwitcherRoot.setVisibility(View.VISIBLE);
     supportInvalidateOptionsMenu();
+    if (tabsAdapter.getSelected() < webViewList.size()) {
+      tabRecyclerView.getLayoutManager().scrollToPosition(tabsAdapter.getSelected());
+    }
   }
 
   private void hideTabSwitcher() {
@@ -1365,8 +1368,8 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
         break;
       case REQUEST_PREFERENCES:
         if (resultCode == RESULT_RESTART) {
-          finish();
           startActivity(new Intent(MainActivity.this, MainActivity.class));
+          finish();
         }
         if (resultCode == RESULT_HISTORY_CLEARED) {
           webViewList.clear();
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/TabsAdapter.java b/app/src/main/java/org/kiwix/kiwixmobile/main/TabsAdapter.java
index 11090ef72..0a759f050 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/TabsAdapter.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/TabsAdapter.java
@@ -128,6 +128,10 @@ public class TabsAdapter extends RecyclerView.Adapter<TabsAdapter.ViewHolder> {
     return webViews.size();
   }
 
+  int getSelected() {
+    return selectedPosition;
+  }
+
   public void setSelected(int position) {
     this.selectedPosition = position;
   }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 59068ff47..24574661f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -124,6 +124,7 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="end"
+    android:background="?attr/drawerBackground"
     android:fitsSystemWindows="true"
     app:headerLayout="@layout/drawer_right" />
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_right.xml b/app/src/main/res/layout/drawer_right.xml
index 16cf982b4..973d16fdb 100644
--- a/app/src/main/res/layout/drawer_right.xml
+++ b/app/src/main/res/layout/drawer_right.xml
@@ -3,8 +3,6 @@
   android:id="@+id/right_drawer_list"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?attr/drawerBackground"
   android:clickable="true"
   android:fitsSystemWindows="true"
-  android:focusable="true"
-  android:orientation="vertical" />
\ No newline at end of file
+  android:focusable="true" />
\ No newline at end of file