diff --git a/effects/presentwindows/presentwindows.cpp b/effects/presentwindows/presentwindows.cpp
index 704e1f897e..7a62ec0191 100755
--- a/effects/presentwindows/presentwindows.cpp
+++ b/effects/presentwindows/presentwindows.cpp
@@ -197,7 +197,7 @@ void PresentWindowsEffect::postPaintScreen()
 {
     if (m_motionManager.areWindowsMoving())
         effects->addRepaintFull();
-    else if (!m_activated && m_motionManager.managingWindows() && !m_closeWindow) {
+    else if (!m_activated && m_motionManager.managingWindows() && !(m_closeWindow && m_closeView->isVisible())) {
         // We have finished moving them back, stop processing
         m_motionManager.unmanageAll();
 
@@ -494,7 +494,8 @@ void PresentWindowsEffect::slotWindowGeometryShapeChanged(EffectWindow* w, const
         return;
     if (!m_windowData.contains(w))
         return;
-    rearrangeWindows();
+    if (w != m_closeWindow)
+        rearrangeWindows();
 }
 
 bool PresentWindowsEffect::borderActivated(ElectricBorder border)
@@ -1593,7 +1594,7 @@ bool PresentWindowsEffect::isSelectableWindow(EffectWindow *w)
 
 bool PresentWindowsEffect::isVisibleWindow(EffectWindow *w)
 {
-    if (w->isDesktop())
+    if (w->isDesktop() || w == m_closeWindow)
         return true;
     return isSelectableWindow(w);
 }
@@ -1620,7 +1621,7 @@ void PresentWindowsEffect::setHighlightedWindow(EffectWindow *w)
 
 void PresentWindowsEffect::elevateCloseWindow()
 {
-    if (!m_closeView)
+    if (!m_closeView || !m_activated)
         return;
     if (EffectWindow *cw = effects->findWindow(m_closeView->winId()))
         effects->setElevatedWindow(cw, true);
@@ -1630,7 +1631,8 @@ void PresentWindowsEffect::updateCloseWindow()
 {
     if (!m_closeView || m_doNotCloseWindows)
         return;
-    if (!m_highlightedWindow || m_highlightedWindow->isDesktop()) {
+
+    if (!m_activated || !m_highlightedWindow || m_highlightedWindow->isDesktop()) {
         m_closeView->hide();
         return;
     }
@@ -1878,6 +1880,7 @@ CloseWindowView::CloseWindowView(QObject *parent)
     , m_armTimer(new QElapsedTimer())
     , m_window(new QQuickView())
     , m_visible(false)
+    , m_posIsValid(false)
 {
     m_window->setFlags(Qt::X11BypassWindowManagerHint);
     m_window->setColor(Qt::transparent);
@@ -1913,12 +1916,21 @@ bool CloseWindowView::isVisible() const
 
 void CloseWindowView::show()
 {
+    if (!m_visible && m_posIsValid) {
+        m_window->setPosition(m_pos);
+        m_posIsValid = false;
+    }
     m_visible = true;
     m_window->show();
 }
 
 void CloseWindowView::hide()
 {
+    if (!m_posIsValid) {
+        m_pos = m_window->position();
+        m_posIsValid = true;
+        m_window->setPosition(-m_window->width(), -m_window->height());
+    }
     m_visible = false;
     QEvent event(QEvent::Leave);
     qApp->sendEvent(m_window.data(), &event);
@@ -1940,6 +1952,7 @@ DELEGATE(WId, winId)
 
 void CloseWindowView::setGeometry(const QRect &geometry)
 {
+    m_posIsValid = false;
     m_window->setGeometry(geometry);
 }
 
diff --git a/effects/presentwindows/presentwindows.h b/effects/presentwindows/presentwindows.h
index 594e5ad4ab..f57c6a77dd 100644
--- a/effects/presentwindows/presentwindows.h
+++ b/effects/presentwindows/presentwindows.h
@@ -59,6 +59,8 @@ private:
     QScopedPointer<QElapsedTimer> m_armTimer;
     QScopedPointer<QQuickView> m_window;
     bool m_visible;
+    QPoint m_pos;
+    bool m_posIsValid;
 };
 
 /**