diff --git a/app/build.gradle b/app/build.gradle
index 0f5ee636d..9caef41a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "be.ugent.zeus.hydra"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 263
-        versionName "2.6.1"
+        versionCode 270
+        versionName "2.7.0"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/be/ugent/zeus/hydra/ui/main/MainActivity.java b/app/src/main/java/be/ugent/zeus/hydra/ui/main/MainActivity.java
index 739c33bf0..b5f5eb065 100644
--- a/app/src/main/java/be/ugent/zeus/hydra/ui/main/MainActivity.java
+++ b/app/src/main/java/be/ugent/zeus/hydra/ui/main/MainActivity.java
@@ -421,6 +421,7 @@ protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         // Change item while the activity is running.
         if (intent.hasExtra(ARG_TAB)) {
+            setIntent(intent);
             int start = intent.getIntExtra(ARG_TAB, R.id.drawer_feed);
             if (intent.getBooleanExtra(ARG_NEW_DEFAULT, true)) {
                 this.initialFragmentId = start;
diff --git a/app/src/main/java/be/ugent/zeus/hydra/ui/main/resto/RestoFragment.java b/app/src/main/java/be/ugent/zeus/hydra/ui/main/resto/RestoFragment.java
index 712b759af..df324fa1a 100644
--- a/app/src/main/java/be/ugent/zeus/hydra/ui/main/resto/RestoFragment.java
+++ b/app/src/main/java/be/ugent/zeus/hydra/ui/main/resto/RestoFragment.java
@@ -220,7 +220,12 @@ private void receiveData(@NonNull List<RestoMenu> data) {
                     //Set the tab to this day!
                     if (menu.getDate().isEqual(startDate)) {
                         Log.d(TAG, "receiveData: setting item to " + (i + 1));
-                        viewPager.setCurrentItem(i, true);
+                        TabLayout.Tab tab = tabLayout.getTabAt(i);
+                        if (tab != null) {
+                            tab.select();
+                        } else {
+                            viewPager.setCurrentItem(i);
+                        }
                         break;
                     }
                 }
@@ -320,6 +325,12 @@ public void onRemovalScheduled() {
         hideExternalViews();
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        hideExternalViews();
+    }
+
     private static class RestoWrapper {
 
         private final SelectableMetaRequest.RestoChoice resto;