diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 14938ce65..0546eb2ba 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="biz.bokhorst.xprivacy"
     android:installLocation="internalOnly"
-    android:versionCode="466"
-    android:versionName="3.6.4" >
+    android:versionCode="467"
+    android:versionName="3.6.5" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15ebf43b2..c14a6c0c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,10 +24,11 @@ Changelog
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
-**Version 3.6.4 BETA**
+**Version 3.6.5 BETA**
 
 * Use application whitelist for *getPackagesForUid* and *Srv_getPackagesForUid* ([issue](/../../issues/2116))
-* Manage white/black lists from usage data (long press uid) ([issue](/../../issues/2093))
+* Manage white/black lists from usage data ([issue](/../../issues/2093))
+	* Long pressing the uid will toggle the whitelist entry and show the whitelist manager
 
 **Version 3.6.2 STABLE**
 
diff --git a/src/biz/bokhorst/xprivacy/ActivityUsage.java b/src/biz/bokhorst/xprivacy/ActivityUsage.java
index 178aea917..2d9bcd41f 100644
--- a/src/biz/bokhorst/xprivacy/ActivityUsage.java
+++ b/src/biz/bokhorst/xprivacy/ActivityUsage.java
@@ -301,12 +301,12 @@ public void onClick(View view) {
 					View.OnLongClickListener longClickListener = new View.OnLongClickListener() {
 						@Override
 						public boolean onLongClick(View view) {
-							int userId = Util.getUserId(Process.myUid());
+							final int userId = Util.getUserId(Process.myUid());
 							final PRestriction usageData = mUsageAdapter.getItem(position);
 							final Hook hook = PrivacyManager.getHook(usageData.restrictionName, usageData.methodName);
 
-							boolean isApp = PrivacyManager.isApplication(usageData.uid);
-							boolean odSystem = PrivacyManager.getSettingBool(userId,
+							final boolean isApp = PrivacyManager.isApplication(usageData.uid);
+							final boolean odSystem = PrivacyManager.getSettingBool(userId,
 									PrivacyManager.cSettingOnDemandSystem, false);
 
 							if ((isApp || odSystem) && hook != null && hook.whitelist() != null
@@ -314,6 +314,17 @@ public boolean onLongClick(View view) {
 								if (Util.hasProLicense(ActivityUsage.this) == null)
 									Util.viewUri(ActivityUsage.this, ActivityMain.cProUri);
 								else {
+									// Toggle whitelist entry
+									Boolean current = PrivacyManager.getSettingBool(usageData.uid, hook.whitelist(),
+											usageData.extra, false);
+									PrivacyManager.setSetting(usageData.uid, hook.whitelist(), usageData.extra,
+											Boolean.toString(!current));
+									final boolean wnomod = PrivacyManager.getSettingBool(usageData.uid,
+											PrivacyManager.cSettingWhitelistNoModify, false);
+									if (!wnomod)
+										PrivacyManager.updateState(usageData.uid);
+
+									// Show whitelist manager
 									WhitelistTask whitelistsTask = new WhitelistTask(usageData.uid, hook.whitelist(),
 											ActivityUsage.this);
 									whitelistsTask.executeOnExecutor(mExecutor, (Object) null);
diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java
index a0a8ac1ca..b21ce4911 100644
--- a/src/biz/bokhorst/xprivacy/PrivacyService.java
+++ b/src/biz/bokhorst/xprivacy/PrivacyService.java
@@ -82,7 +82,7 @@ public class PrivacyService extends IPrivacyService.Stub {
 	private static final String cTableUsage = "usage";
 	private static final String cTableSetting = "setting";
 
-	private static final int cCurrentVersion = 466;
+	private static final int cCurrentVersion = 467;
 	private static final String cServiceName = "xprivacy453";
 
 	private boolean mCorrupt = false;