diff --git a/pocketmode/src/org/lineageos/pocketmode/ProximitySensor.java b/pocketmode/src/org/lineageos/pocketmode/ProximitySensor.java
index 711bc17..35fda8e 100644
--- a/pocketmode/src/org/lineageos/pocketmode/ProximitySensor.java
+++ b/pocketmode/src/org/lineageos/pocketmode/ProximitySensor.java
@@ -55,12 +55,7 @@ public class ProximitySensor implements SensorEventListener {
 
     @Override
     public void onSensorChanged(SensorEvent event) {
-        boolean isNear = event.values[0] < mSensor.getMaximumRange();
-        try {
-            FileUtils.stringToFile(FP_PROX_NODE, isNear ? "1" : "0");
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to write to " + FP_PROX_NODE, e);
-        }
+        setFPProximityState(event.values[0] < mSensor.getMaximumRange());
     }
 
     @Override
@@ -68,6 +63,14 @@ public class ProximitySensor implements SensorEventListener {
         /* Empty */
     }
 
+    private void setFPProximityState(boolean isNear) {
+        try {
+            FileUtils.stringToFile(FP_PROX_NODE, isNear ? "1" : "0");
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to write to " + FP_PROX_NODE, e);
+        }
+    }
+
     protected void enable() {
         if (DEBUG) Log.d(TAG, "Enabling");
         submit(() -> {
@@ -81,5 +84,7 @@ public class ProximitySensor implements SensorEventListener {
         submit(() -> {
             mSensorManager.unregisterListener(this, mSensor);
         });
+        // Ensure FP is left enabled
+        setFPProximityState(/* isNear */ false);
     }
 }