diff --git a/src/mami.js/controls/views.js b/src/mami.js/controls/views.js
index cf11a1c..7061592 100644
--- a/src/mami.js/controls/views.js
+++ b/src/mami.js/controls/views.js
@@ -45,6 +45,7 @@ const MamiViewsControl = function(options) {
         const element = extractElement(elementInfo);
         element.classList.toggle('views-item', true);
         element.classList.toggle('views-background', false);
+        element.classList.toggle('hidden', false);
 
         if(!targetBody.contains(element))
             targetBody.appendChild(element);
@@ -75,6 +76,8 @@ const MamiViewsControl = function(options) {
                         fromElem: prevElem,
                     });
             }
+
+            prevElem.classList.toggle('hidden', false);
         }
     };
 
@@ -91,6 +94,7 @@ const MamiViewsControl = function(options) {
             const nextElemInfo = views[views.length - 1];
             const nextElem = extractElement(nextElemInfo);
 
+            nextElem.classList.toggle('hidden', false);
             nextElem.classList.toggle('views-background', false);
 
             if(typeof nextElemInfo.onViewForeground === 'function')
@@ -110,6 +114,8 @@ const MamiViewsControl = function(options) {
             }
         }
 
+        element.classList.toggle('hidden', true);
+
         if(typeof elementInfo.onViewBackground === 'function')
             await elementInfo.onViewBackground();
 
@@ -174,6 +180,7 @@ const MamiViewsControl = function(options) {
 
             element.classList.toggle('views-item', true);
             element.classList.toggle('views-background', true);
+            element.classList.toggle('hidden', true);
 
             if(!targetBody.contains(element))
                 targetBody.appendChild(element);
diff --git a/src/mami.js/sockchat/handlers.js b/src/mami.js/sockchat/handlers.js
index b1708c1..87098c0 100644
--- a/src/mami.js/sockchat/handlers.js
+++ b/src/mami.js/sockchat/handlers.js
@@ -99,23 +99,7 @@ const MamiSockChatHandlers = function(ctx, client, setLoadingOverlay, sockChatRe
         Umi.Parsing.Init();
 
         if(ctx.views.count() > 1)
-            ctx.views.pop(ctx => MamiAnimate({
-                async: true,
-                duration: 120,
-                easing: 'inOutSine',
-                start: () => {
-                    ctx.toElem.style.zIndex = '100';
-                    ctx.fromElem.style.pointerEvents = 'none';
-                    ctx.fromElem.style.zIndex = '200';
-                },
-                update: t => {
-                    ctx.fromElem.style.transform = `scale(${1 + (.25 * t)})`;
-                    ctx.fromElem.style.opacity = 1 - (1 * t).toString();
-                },
-                end: () => {
-                    ctx.toElem.style.zIndex = null;
-                },
-            }));
+            ctx.views.pop();
     };
     handlers['session:fail'] = ev => {
         if(dumpEvents) console.log('session:fail', ev.detail);
diff --git a/src/mami.js/ui/loading-overlay.jsx b/src/mami.js/ui/loading-overlay.jsx
index bc8eb79..0f38fe9 100644
--- a/src/mami.js/ui/loading-overlay.jsx
+++ b/src/mami.js/ui/loading-overlay.jsx
@@ -44,5 +44,20 @@ Umi.UI.LoadingOverlay = function(icon, header, message) {
         getElement: function() {
             return html;
         },
+        getViewTransition: mode => {
+            if(mode === 'pop')
+                return ctx => MamiAnimate({
+                    async: true,
+                    duration: 200,
+                    easing: 'inOutSine',
+                    start: () => {
+                        ctx.fromElem.style.pointerEvents = 'none';
+                    },
+                    update: t => {
+                        ctx.fromElem.style.transform = `scale(${1 + (.25 * t)})`;
+                        ctx.fromElem.style.opacity = 1 - (1 * t).toString();
+                    },
+                });
+        },
     };
 };