diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
index dbe75759c..94000739e 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
@@ -206,6 +206,7 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
                     Intent intent = new Intent(shareIntent);
                     intent.setComponent(new ComponentName(appItem.getPackageName(), appItem.getName()));
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    eventBus.post(new BottomSheetLockEvent(true, 0, false));
                     getActivity().startActivity(intent);
                 } else {
                     bundle.putInt(BundleKeys.KEY_OPERATION_CODE, 7);
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
index 29beb7d34..c5cf8f1cb 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
@@ -118,6 +118,7 @@ public class EntryMenuController extends BaseController {
                 intent.setComponent(new ComponentName(packageName, name));
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 getActivity().startActivity(intent);
+                eventBus.post(new BottomSheetLockEvent(true, 0, false));
             }
         }
     }
diff --git a/app/src/main/res/layout/controller_server_selection.xml b/app/src/main/res/layout/controller_server_selection.xml
index 5dc0ca0bf..b1ec60c43 100644
--- a/app/src/main/res/layout/controller_server_selection.xml
+++ b/app/src/main/res/layout/controller_server_selection.xml
@@ -73,6 +73,7 @@
         android:indeterminate="true"
         android:indeterminateTint="@color/nc_white_color_complete"
         android:indeterminateTintMode="src_in"
+        android:keepScreenOn="true"
         android:visibility="invisible"/>
 
     <TextView
@@ -81,12 +82,12 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/progress_bar"
         android:layout_centerHorizontal="true"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginTop="56dp"
         android:lines="2"
         android:text="@string/nc_get_from_provider"
         android:textAlignment="center"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:textAllCaps="true"
         android:textColor="@color/nc_light_blue_color"/>