diff --git a/clients/aurorae/src/decorationoptions.cpp b/clients/aurorae/src/decorationoptions.cpp
index b9618f1fc8..b0416342c5 100644
--- a/clients/aurorae/src/decorationoptions.cpp
+++ b/clients/aurorae/src/decorationoptions.cpp
@@ -172,9 +172,16 @@ void DecorationOptions::setDecoration(KDecoration2::Decoration *decoration)
         disconnect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged);
         disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged);
         disconnect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsRightChanged, this, &DecorationOptions::titleButtonsChanged);
+        disconnect(m_paletteConnection);
     }
     m_decoration = decoration;
     connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::activeChanged, this, &DecorationOptions::slotActiveChanged);
+    m_paletteConnection = connect(m_decoration->client().data(), &KDecoration2::DecoratedClient::paletteChanged, this,
+        [this] (const QPalette &pal) {
+            m_colors.update(pal);
+            emit colorsChanged();
+        }
+    );
     auto s = m_decoration->settings();
     connect(s.data(), &KDecoration2::DecorationSettings::fontChanged, this, &DecorationOptions::fontChanged);
     connect(s.data(), &KDecoration2::DecorationSettings::decorationButtonsLeftChanged, this, &DecorationOptions::titleButtonsChanged);
diff --git a/clients/aurorae/src/decorationoptions.h b/clients/aurorae/src/decorationoptions.h
index 6606b39eb7..f9013579ee 100644
--- a/clients/aurorae/src/decorationoptions.h
+++ b/clients/aurorae/src/decorationoptions.h
@@ -244,6 +244,7 @@ private:
     bool m_active;
     KDecoration2::Decoration *m_decoration;
     ColorSettings m_colors;
+    QMetaObject::Connection m_paletteConnection;
 };
 
 class Borders : public QObject
diff --git a/main_x11.cpp b/main_x11.cpp
index 43d7477945..140acc49a9 100644
--- a/main_x11.cpp
+++ b/main_x11.cpp
@@ -278,6 +278,9 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
     setenv("QT_QPA_PLATFORM", "xcb", true);
 
     qunsetenv("QT_DEVICE_PIXEL_RATIO");
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+    QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling);
+#endif
 
     KWin::ApplicationX11 a(argc, argv);
     a.setupTranslator();