diff --git a/oeffi/AndroidManifest.xml b/oeffi/AndroidManifest.xml
index 62f886f..b5e9746 100644
--- a/oeffi/AndroidManifest.xml
+++ b/oeffi/AndroidManifest.xml
@@ -116,8 +116,8 @@
             android:exported="true"
             android:configChanges="keyboard|keyboardHidden"
             android:label="@string/station_details_activity_title"
-            android:taskAffinity="de.schildbach.oeffi.stations">
-        </activity>
+            android:taskAffinity="de.schildbach.oeffi.stations"
+            android:showWhenLocked="true" />
 
         <activity
             android:name=".stations.FavoriteStationsActivity"
@@ -196,7 +196,8 @@
             android:name=".directions.TripDetailsActivity"
             android:configChanges="keyboard|keyboardHidden"
             android:label="@string/trip_details_title"
-            android:taskAffinity="de.schildbach.oeffi.directions" />
+            android:taskAffinity="de.schildbach.oeffi.directions"
+            android:showWhenLocked="true" />
 
         <activity
             android:name=".directions.DirectionsShortcutActivity"
@@ -243,7 +244,8 @@
             android:configChanges="keyboard|keyboardHidden"
             android:launchMode="singleTop"
             android:taskAffinity="de.schildbach.oeffi.plans"
-            android:theme="@style/My.Theme.Fullscreen">
+            android:theme="@style/My.Theme.Fullscreen"
+            android:showWhenLocked="true">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
index 10b5f51..5d08c9b 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
@@ -44,7 +44,6 @@ import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
@@ -366,11 +365,6 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
         super.onDestroy();
     }
 
-    @Override
-    public void onAttachedToWindow() {
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-    }
-
     @Override
     public void onConfigurationChanged(final Configuration config) {
         super.onConfigurationChanged(config);
diff --git a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java
index 15a4591..58d2bfd 100644
--- a/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/plans/PlanActivity.java
@@ -29,7 +29,6 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Process;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.PopupMenu;
@@ -255,11 +254,6 @@ public class PlanActivity extends ComponentActivity {
         super.onDestroy();
     }
 
-    @Override
-    public void onAttachedToWindow() {
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-    }
-
     @Override
     public boolean onSearchRequested() {
         if (!stations.isEmpty())
diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
index 4ff6e10..1f2ced8 100644
--- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
@@ -34,7 +34,6 @@ import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
@@ -258,11 +257,6 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa
         super.onDestroy();
     }
 
-    @Override
-    public void onAttachedToWindow() {
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
-    }
-
     @Override
     public void onConfigurationChanged(final Configuration config) {
         super.onConfigurationChanged(config);