diff --git a/src/Window.cpp b/src/Window.cpp
index 4b3fc59a..9b9f5443 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -167,7 +167,6 @@ void CWindow::updateToplevel() {
     if (!m_phForeignToplevel)
         return;
 
-    wlr_foreign_toplevel_handle_v1_set_app_id(m_phForeignToplevel, g_pXWaylandManager->getAppIDClass(this).c_str());
     wlr_foreign_toplevel_handle_v1_set_title(m_phForeignToplevel, m_szTitle.c_str());
     wlr_foreign_toplevel_handle_v1_set_fullscreen(m_phForeignToplevel, m_bIsFullscreen);
 
diff --git a/src/Window.hpp b/src/Window.hpp
index dab1e88b..139a5db5 100644
--- a/src/Window.hpp
+++ b/src/Window.hpp
@@ -131,7 +131,7 @@ public:
     CAnimatedVariable m_cRealShadowColor;
 
     // for toplevel monitor events
-    int             m_iLastToplevelMonitorID = -1;
+    uint64_t          m_iLastToplevelMonitorID = -1;
 
     // For the list lookup
     bool operator==(const CWindow& rhs) {