diff --git a/uhabits-android/src/main/res/layout/activity_edit_habit.xml b/uhabits-android/src/main/res/layout/activity_edit_habit.xml
index a8e91e7f0..44200ca13 100644
--- a/uhabits-android/src/main/res/layout/activity_edit_habit.xml
+++ b/uhabits-android/src/main/res/layout/activity_edit_habit.xml
@@ -196,6 +196,24 @@
                         android:hint="@string/measurable_units_example"/>
                 </LinearLayout>
             </FrameLayout>
+            
+            <FrameLayout
+                android:id='@+id/numericalFrequencyOuterBox'
+                style="@style/FormOuterBox">
+
+                <LinearLayout style="@style/FormInnerBox">
+                    <TextView
+                        style="@style/FormLabel"
+                        android:text="@string/frequency" />
+                    <TextView
+                        style="@style/FormDropdown"
+                        android:id="@+id/numericalFrequencyPicker"
+                        android:text="@string/every_week"
+                        android:textColor="?attr/contrast100"
+                        />
+                </LinearLayout>
+            </FrameLayout>
+
             <LinearLayout
                 android:id="@+id/targetOuterBox"
                 android:layout_width="match_parent"
@@ -236,23 +254,6 @@
                 </FrameLayout>
             </LinearLayout>
 
-            <FrameLayout
-                android:id='@+id/numericalFrequencyOuterBox'
-                style="@style/FormOuterBox">
-
-                <LinearLayout style="@style/FormInnerBox">
-                    <TextView
-                        style="@style/FormLabel"
-                        android:text="@string/frequency" />
-                    <TextView
-                        style="@style/FormDropdown"
-                        android:id="@+id/numericalFrequencyPicker"
-                        android:text="@string/every_week"
-                        android:textColor="?attr/contrast100"
-                        />
-                </LinearLayout>
-            </FrameLayout>
-
             <!-- Reminder -->
             <FrameLayout style="@style/FormOuterBox">
                 <LinearLayout style="@style/FormInnerBox">
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
index bce63bcec..a53135f9b 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
@@ -49,6 +49,7 @@ class HistoryChartTest {
         dateFormatter = JavaLocalDateFormatter(Locale.US),
         firstWeekday = SUNDAY,
         onDateClickedListener = dateClickedListener,
+        defaultSquare = OFF,
         series = listOf(
             2, // today
             2, 1, 2, 1, 2, 1, 2,