diff --git a/app/view/containmentinterface.cpp b/app/view/containmentinterface.cpp
index 64e2ba5ef..a72c591bc 100644
--- a/app/view/containmentinterface.cpp
+++ b/app/view/containmentinterface.cpp
@@ -492,11 +492,7 @@ void ContainmentInterface::toggleAppletExpanded(const int id)
             PlasmaQuick::AppletQuickItem *ai = applet->property("_plasma_graphicObject").value<PlasmaQuick::AppletQuickItem *>();
 
             if (ai) {
-                if (!ai->isActivationTogglesExpanded()) {
-                    ai->setActivationTogglesExpanded(true);
-                }
-
-                emit applet->activated();
+                ai->setExpanded(!ai->isExpanded());
             }
         }
     }
diff --git a/app/view/visibilitymanager.cpp b/app/view/visibilitymanager.cpp
index 0621687ee..672cdacf2 100644
--- a/app/view/visibilitymanager.cpp
+++ b/app/view/visibilitymanager.cpp
@@ -609,10 +609,19 @@ void VisibilityManager::raiseViewTemporarily()
     });
 }
 
+bool VisibilityManager::isValidMode() const
+{
+    return (m_mode != Types::None && m_mode != Types::NormalWindow);
+}
+
 void VisibilityManager::toggleHiddenState()
 {
     if (!m_latteView->inEditMode()) {
         if (m_mode == Latte::Types::SideBar) {
+            if (m_blockHidingEvents.contains(Q_FUNC_INFO)) {
+                removeBlockHidingEvent(Q_FUNC_INFO);
+            }
+
             if (m_isHidden) {
                 emit mustBeShown();
             } else {
diff --git a/app/view/visibilitymanager.h b/app/view/visibilitymanager.h
index 4300c92f3..345a55890 100644
--- a/app/view/visibilitymanager.h
+++ b/app/view/visibilitymanager.h
@@ -182,6 +182,8 @@ private slots:
     void dodgeMaximized();
     void updateHiddenState();
 
+    bool isValidMode() const;
+
 private:
     WindowSystem::AbstractWindowInterface *m_wm;
     Types::Visibility m_mode{Types::None};