diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
index 37e6affd..2d3cf65b 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryAdapter.java
@@ -261,6 +261,12 @@ public class EntryAdapter extends RecyclerView.Adapter<EntryHolder> implements I
         return period;
     }
 
+    @Override
+    public void onViewDetachedFromWindow(final EntryHolder holder) {
+        holder.hideCode();
+        super.onViewDetachedFromWindow(holder);
+    }
+
     public boolean isPeriodUniform() {
         return getUniformPeriod() != -1;
     }
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
index 920bc194..ae65a113 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/views/EntryHolder.java
@@ -119,7 +119,6 @@ public class EntryHolder extends RecyclerView.ViewHolder {
 
     public void refreshCode() {
         updateCode();
-        _codeIsRevealed = true;
     }
 
     public void revealCode() {