diff --git a/app/view/windowstracker/currentscreentracker.cpp b/app/view/windowstracker/currentscreentracker.cpp
index 82584d24..c8c02607 100644
--- a/app/view/windowstracker/currentscreentracker.cpp
+++ b/app/view/windowstracker/currentscreentracker.cpp
@@ -1,153 +1,174 @@
 /*
 *  Copyright 2019  Michail Vourlakos <mvourlakos@gmail.com>
 *
 *  This file is part of Latte-Dock
 *
 *  Latte-Dock is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public License as
 *  published by the Free Software Foundation; either version 2 of
 *  the License, or (at your option) any later version.
 *
 *  Latte-Dock is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "currentscreentracker.h"
 
 // local
 #include "../view.h"
 #include "../../wm/schemecolors.h"
 #include "../../wm/tracker/lastactivewindow.h"
 #include "../../wm/tracker/trackerwindows.h"
 
 namespace Latte {
 namespace ViewPart {
 namespace TrackerPart {
 
 CurrentScreenTracker::CurrentScreenTracker(WindowsTracker *parent)
     : QObject(parent),
       m_latteView(parent->view()),
       m_wm(parent->wm())
 {
     init();
 }
 
 CurrentScreenTracker::~CurrentScreenTracker()
 {
     m_wm->windowsTracker()->removeView(m_latteView);
 }
 
 void  CurrentScreenTracker::init()
 {
+    if (lastActiveWindow()) {
+        initSignalsForInformation();
+    }
+
+    connect(m_latteView, &Latte::View::layoutChanged, this, [&]() {
+        if (m_latteView->layout()) {
+            initSignalsForInformation();
+        }
+    });
+
     connect(m_wm->windowsTracker(), &WindowSystem::Tracker::Windows::informationAnnounced, this, [&](const Latte::View *view) {
         if (m_latteView == view) {
             initSignalsForInformation();
         }
     });
 
     connect(m_wm->windowsTracker(), &WindowSystem::Tracker::Windows::activeWindowMaximizedChanged, this, [&](const Latte::View *view) {
         if (m_latteView == view) {
             emit activeWindowMaximizedChanged();
         }
     });
 
     connect(m_wm->windowsTracker(), &WindowSystem::Tracker::Windows::activeWindowTouchingChanged, this, [&](const Latte::View *view) {
         if (m_latteView == view) {
             emit activeWindowTouchingChanged();
         }
     });
 
     connect(m_wm->windowsTracker(), &WindowSystem::Tracker::Windows::existsWindowActiveChanged, this, [&](const Latte::View *view) {
         if (m_latteView == view) {
             emit existsWindowActiveChanged();
         }
     });
 
     connect(m_wm->windowsTracker(), &WindowSystem::Tracker::Windows::existsWindowMaximizedChanged, this, [&](const Latte::View *view) {
         if (m_latteView == view) {
             emit existsWindowMaximizedChanged();
         }
     });
 
     connect(m_wm->windowsTracker(), &WindowSystem::Tracker::Windows::existsWindowTouchingChanged, this, [&](const Latte::View *view) {
         if (m_latteView == view) {
             emit existsWindowTouchingChanged();
         }
     });
 
     connect(m_wm->windowsTracker(), &WindowSystem::Tracker::Windows::activeWindowSchemeChanged, this, [&](const Latte::View *view) {
         if (m_latteView == view) {
             emit activeWindowSchemeChanged();
         }
     });
 
     connect(m_wm->windowsTracker(), &WindowSystem::Tracker::Windows::touchingWindowSchemeChanged, this, [&](const Latte::View *view) {
         if (m_latteView == view) {
             emit touchingWindowSchemeChanged();
         }
     });
 }
 
 void CurrentScreenTracker::initSignalsForInformation()
 {
-    connect(lastActiveWindow(), &WindowSystem::Tracker::LastActiveWindow::draggingStarted,
-            this, &CurrentScreenTracker::activeWindowDraggingStarted);
+    if (!m_initialized) {
+        connect(lastActiveWindow(), &WindowSystem::Tracker::LastActiveWindow::draggingStarted,
+                this, &CurrentScreenTracker::activeWindowDraggingStarted);
+
+        m_initialized = true;
+    }
 
     emit lastActiveWindowChanged();
+    emit activeWindowMaximizedChanged();
+    emit activeWindowTouchingChanged();
+    emit existsWindowActiveChanged();
+    emit existsWindowMaximizedChanged();
+    emit existsWindowTouchingChanged();
+    emit activeWindowSchemeChanged();
+    emit touchingWindowSchemeChanged();
 }
 
 bool CurrentScreenTracker::activeWindowMaximized() const
 {
     return m_wm->windowsTracker()->activeWindowMaximized(m_latteView);
 }
 
 bool CurrentScreenTracker::activeWindowTouching() const
 {
     return m_wm->windowsTracker()->activeWindowTouching(m_latteView);
 }
 
 bool CurrentScreenTracker::existsWindowActive() const
 {
     return m_wm->windowsTracker()->existsWindowActive(m_latteView);
 }
 
 bool CurrentScreenTracker::existsWindowMaximized() const
 {
     return m_wm->windowsTracker()->existsWindowMaximized(m_latteView);
 }
 
 bool CurrentScreenTracker::existsWindowTouching() const
 {
     return m_wm->windowsTracker()->existsWindowTouching(m_latteView);
 }
 
 WindowSystem::SchemeColors *CurrentScreenTracker::activeWindowScheme() const
 {
     return m_wm->windowsTracker()->activeWindowScheme(m_latteView);
 }
 
 WindowSystem::SchemeColors *CurrentScreenTracker::touchingWindowScheme() const
 {
     return m_wm->windowsTracker()->touchingWindowScheme(m_latteView);
 }
 
 WindowSystem::Tracker::LastActiveWindow *CurrentScreenTracker::lastActiveWindow()
 {
     return m_wm->windowsTracker()->lastActiveWindow(m_latteView);
 }
 
 
 //! Window Functions
 void CurrentScreenTracker::requestMoveLastWindow(int localX, int localY)
 {
     m_wm->windowsTracker()->lastActiveWindow(m_latteView)->requestMove(m_latteView, localX, localY);
 }
 
 }
 }
 }
diff --git a/app/view/windowstracker/currentscreentracker.h b/app/view/windowstracker/currentscreentracker.h
index 68723b78..a585ea18 100644
--- a/app/view/windowstracker/currentscreentracker.h
+++ b/app/view/windowstracker/currentscreentracker.h
@@ -1,105 +1,108 @@
 /*
 *  Copyright 2019  Michail Vourlakos <mvourlakos@gmail.com>
 *
 *  This file is part of Latte-Dock
 *
 *  Latte-Dock is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public License as
 *  published by the Free Software Foundation; either version 2 of
 *  the License, or (at your option) any later version.
 *
 *  Latte-Dock is distributed in the hope that it will be useful,
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *  GNU General Public License for more details.
 *
 *  You should have received a copy of the GNU General Public License
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef WINDOWSCURRENTSCREENTRACKER_H
 #define WINDOWSCURRENTSCREENTRACKER_H
 
 // local
 #include "../../wm/abstractwindowinterface.h"
 
 // Qt
 #include <QObject>
 
 namespace Latte{
 class View;
 
 namespace ViewPart {
 class WindowsTracker;
 }
 
 namespace WindowSystem {
 class AbstractWindowInterface;
 class SchemeColors;
 namespace Tracker {
 class LastActiveWindow;
 }
 }
 }
 
 namespace Latte {
 namespace ViewPart {
 namespace TrackerPart {
 
 class CurrentScreenTracker : public QObject {
     Q_OBJECT
     Q_PROPERTY(bool activeWindowMaximized READ activeWindowMaximized NOTIFY activeWindowMaximizedChanged)
     Q_PROPERTY(bool activeWindowTouching READ activeWindowTouching NOTIFY activeWindowTouchingChanged)
     Q_PROPERTY(bool existsWindowActive READ existsWindowActive NOTIFY existsWindowActiveChanged)
     Q_PROPERTY(bool existsWindowMaximized READ existsWindowMaximized NOTIFY existsWindowMaximizedChanged)
     Q_PROPERTY(bool existsWindowTouching READ existsWindowTouching NOTIFY existsWindowTouchingChanged)
     Q_PROPERTY(Latte::WindowSystem::SchemeColors *activeWindowScheme READ activeWindowScheme NOTIFY activeWindowSchemeChanged)
     Q_PROPERTY(Latte::WindowSystem::SchemeColors *touchingWindowScheme READ touchingWindowScheme NOTIFY touchingWindowSchemeChanged)
 
     Q_PROPERTY(Latte::WindowSystem::Tracker::LastActiveWindow *lastActiveWindow READ lastActiveWindow NOTIFY lastActiveWindowChanged)
 
 public:
     explicit CurrentScreenTracker(WindowsTracker *parent);
     virtual ~CurrentScreenTracker();
 
     bool activeWindowMaximized() const;
     bool activeWindowTouching() const;
     bool existsWindowActive() const;
     bool existsWindowMaximized() const;
     bool existsWindowTouching() const;
 
     WindowSystem::SchemeColors *activeWindowScheme() const;
     WindowSystem::SchemeColors *touchingWindowScheme() const;
 
     WindowSystem::Tracker::LastActiveWindow *lastActiveWindow();
 
 public slots:
     Q_INVOKABLE void requestMoveLastWindow(int localX, int localY);
 
 signals:
     void activeWindowDraggingStarted();
     void activeWindowMaximizedChanged();
     void activeWindowTouchingChanged();
     void existsWindowActiveChanged();
     void existsWindowMaximizedChanged();
     void existsWindowTouchingChanged();
     void activeWindowSchemeChanged();
     void touchingWindowSchemeChanged();
 
     void lastActiveWindowChanged();
 
 private slots:
     void initSignalsForInformation();
 
 private:
     void init();
 
+private:
+    bool m_initialized{false};
+
     Latte::View *m_latteView{nullptr};
     WindowSystem::AbstractWindowInterface *m_wm{nullptr};
 };
 
 }
 }
 }
 
 #endif