diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
index 554aa8d7f90..ecff7c3a6c9 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
@@ -1051,12 +1051,13 @@ public boolean onItemClick(View view, int position, float x, float y) {
                 }
                 processRowSelect(view, outside, x, y);
             }
+            swipeBackEnabled = false;
             return true;
         }
 
         @Override
         public void onLongClickRelease() {
-
+            swipeBackEnabled = true;
         }
 
         @Override