diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index c5d70329..fd4783da 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -882,6 +882,7 @@ void CConfigManager::setDefaultAnimationVars() {
     // init the root nodes
     m_AnimationTree.setConfigForNode("global", 1, 8.f, "", "default");
     m_AnimationTree.setConfigForNode("__internal_fadeCTM", 1, 5.f, "", "linear");
+    m_AnimationTree.setConfigForNode("borderangle", 0, 0.f, "", "default");
 }
 
 std::optional<std::string> CConfigManager::resetHLConfig() {
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
index 97d7ecc0..962386c8 100644
--- a/src/desktop/Window.cpp
+++ b/src/desktop/Window.cpp
@@ -552,9 +552,11 @@ void CWindow::onMap() {
 
     m_fMovingFromWorkspaceAlpha->setValueAndWarp(1.F);
 
-    m_fBorderAngleAnimationProgress->setValueAndWarp(0.f);
-    m_fBorderAngleAnimationProgress->setCallbackOnEnd([&](WP<CBaseAnimatedVariable> p) { onBorderAngleAnimEnd(p); }, false);
-    *m_fBorderAngleAnimationProgress = 1.f;
+    if (m_fBorderAngleAnimationProgress->enabled()) {
+        m_fBorderAngleAnimationProgress->setValueAndWarp(0.f);
+        m_fBorderAngleAnimationProgress->setCallbackOnEnd([&](WP<CBaseAnimatedVariable> p) { onBorderAngleAnimEnd(p); }, false);
+        *m_fBorderAngleAnimationProgress = 1.f;
+    }
 
     m_fMovingFromWorkspaceAlpha->setValueAndWarp(1.F);