diff --git a/assets/qml/JsonEditor/Footer.qml b/assets/qml/JsonEditor/Footer.qml
index 6ff80552..701010f1 100644
--- a/assets/qml/JsonEditor/Footer.qml
+++ b/assets/qml/JsonEditor/Footer.qml
@@ -27,7 +27,7 @@ import "../Widgets" as Widgets
 
 Rectangle {
     id: root
-    radius: jsonEditor.radius
+    color: Cpp_ThemeManager.toolbarGradient2
     height: footer.implicitHeight + 4 * app.spacing
 
     //
@@ -37,13 +37,29 @@ Rectangle {
     signal scrollToBottom()
 
     //
-    // Background & border
+    // Radius compensator
     //
-    border.width: 1
-    border.color: Cpp_ThemeManager.toolbarGradient1
-    gradient: Gradient {
-        GradientStop { position: 0; color: Cpp_ThemeManager.toolbarGradient1 }
-        GradientStop { position: 1; color: Cpp_ThemeManager.toolbarGradient2 }
+    Rectangle {
+        color: root.color
+        height: root.radius
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+    }
+
+    //
+    // Top border
+    //
+    Rectangle {
+        height: 1
+        color: Cpp_ThemeManager.toolbarGradient1
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
     }
 
     //
diff --git a/assets/qml/JsonEditor/Header.qml b/assets/qml/JsonEditor/Header.qml
index f4d8f5a7..60d5df8b 100644
--- a/assets/qml/JsonEditor/Header.qml
+++ b/assets/qml/JsonEditor/Header.qml
@@ -34,19 +34,10 @@ Rectangle {
     //
     Rectangle {
         id: bg
+        border.width: 1
         anchors.fill: parent
-
-        gradient: Gradient {
-            GradientStop { position: 0; color: Cpp_ThemeManager.toolbarGradient1 }
-            GradientStop { position: 1; color: Cpp_ThemeManager.toolbarGradient2 }
-        }
-
-        Rectangle {
-            border.width: 1
-            anchors.fill: parent
-            color: "transparent"
-            border.color: Qt.darker(Cpp_ThemeManager.toolbarGradient2, 1.5)
-        }
+        color: Cpp_ThemeManager.toolbarGradient2
+        border.color: Qt.darker(Cpp_ThemeManager.toolbarGradient2, 1.5)
 
         Rectangle {
             height: 1
diff --git a/assets/qml/Windows/JsonEditor.qml b/assets/qml/Windows/JsonEditor.qml
index d82a9c98..71463192 100644
--- a/assets/qml/Windows/JsonEditor.qml
+++ b/assets/qml/Windows/JsonEditor.qml
@@ -123,6 +123,7 @@ FramelessWindow.CustomWindow {
         //
         Footer {
             id: footer
+            radius: root.radius
             onCloseWindow: root.close()
             onScrollToBottom: groupEditor.scrollToBottom()