diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 737564fb..39a6f4f1 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -329,6 +329,7 @@ const conversation = {
       } else {
         // if we collapse it, we should reset the dive
         this._diven = false
+        this.undive()
       }
     },
     virtualHidden (value) {