diff --git a/src/org/thoughtcrime/redphone/RedPhone.java b/src/org/thoughtcrime/redphone/RedPhone.java
index fdfd3c3c87..dd0e0557f0 100644
--- a/src/org/thoughtcrime/redphone/RedPhone.java
+++ b/src/org/thoughtcrime/redphone/RedPhone.java
@@ -100,6 +100,7 @@ public class RedPhone extends Activity {
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
     super.onCreate(savedInstanceState);
 
     requestWindowFeature(Window.FEATURE_NO_TITLE);
diff --git a/src/org/thoughtcrime/redphone/call/LockManager.java b/src/org/thoughtcrime/redphone/call/LockManager.java
index cc5858b4b7..13c64cd201 100644
--- a/src/org/thoughtcrime/redphone/call/LockManager.java
+++ b/src/org/thoughtcrime/redphone/call/LockManager.java
@@ -3,7 +3,6 @@ package org.thoughtcrime.redphone.call;
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
 import android.util.Log;
@@ -19,15 +18,12 @@ public class LockManager {
 
   private final PowerManager.WakeLock        fullLock;
   private final PowerManager.WakeLock        partialLock;
-  private final KeyguardManager.KeyguardLock keyGuardLock;
-  private final KeyguardManager              km;
   private final WifiManager.WifiLock         wifiLock;
   private final ProximityLock                proximityLock;
 
   private final AccelerometerListener accelerometerListener;
   private final boolean               wifiLockEnforced;
 
-  private boolean keyguardDisabled;
 
   private int orientation = AccelerometerListener.ORIENTATION_UNKNOWN;
 
@@ -51,9 +47,6 @@ public class LockManager {
     partialLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "RedPhone Partial");
     proximityLock = new ProximityLock(pm);
 
-    km = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
-    keyGuardLock = km.newKeyguardLock("RedPhone KeyGuard");
-
     WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
     wifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "RedPhone Wifi");
 
@@ -98,22 +91,18 @@ public class LockManager {
       case IDLE:
         setLockState(LockState.SLEEP);
         accelerometerListener.enable(false);
-        maybeEnableKeyguard();
         break;
       case PROCESSING:
         setLockState(LockState.PARTIAL);
         accelerometerListener.enable(false);
-        maybeEnableKeyguard();
         break;
       case INTERACTIVE:
         setLockState(LockState.FULL);
         accelerometerListener.enable(false);
-        disableKeyguard();
         break;
       case IN_CALL:
         accelerometerListener.enable(true);
         updateInCallLockState();
-        disableKeyguard();
         break;
     }
   }
@@ -149,25 +138,4 @@ public class LockManager {
     }
     Log.d(TAG, "Entered Lock State: " + newState);
   }
-
-  private void disableKeyguard() {
-    if(keyguardLocked()) {
-      keyGuardLock.disableKeyguard();
-      keyguardDisabled = true;
-    }
-  }
-
-  private void maybeEnableKeyguard() {
-    if (keyguardDisabled) {
-      keyGuardLock.reenableKeyguard();
-      keyguardDisabled = false;
-    }
-  }
-
-  private boolean keyguardLocked() {
-    if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-      return km.isKeyguardLocked();
-    }
-    return true;
-  }
 }