diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
index 951d6043..50fbe087 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryListView.java
@@ -108,8 +108,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
     }
 
     public void setGroupFilter(String group, boolean apply) {
-        _touchCallback.setIsLongPressDragEnabled(group == null);
         _adapter.setGroupFilter(group, apply);
+        _touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
 
         if (apply) {
             runEntriesAnimation();
@@ -117,7 +117,7 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
     }
 
     public void setIsLongPressDragEnabled(boolean enabled) {
-        _touchCallback.setIsLongPressDragEnabled(enabled);
+        _touchCallback.setIsLongPressDragEnabled(enabled && _adapter.isDragAndDropAllowed());
     }
 
     public void setIsCopyOnTapEnabled(boolean enabled) {
@@ -136,8 +136,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
     }
 
     public void setSortCategory(SortCategory sortCategory, boolean apply) {
-        _touchCallback.setIsLongPressDragEnabled(sortCategory == SortCategory.CUSTOM);
         _adapter.setSortCategory(sortCategory, apply);
+        _touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
 
         if (apply) {
             runEntriesAnimation();
@@ -145,8 +145,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
     }
 
     public void setSearchFilter(String search) {
-        _touchCallback.setIsLongPressDragEnabled(search == null);
         _adapter.setSearchFilter(search);
+        _touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
     }
 
     public void setViewMode(ViewMode mode) {