diff --git a/package/contents/ui/config/configAppearance.qml b/package/contents/ui/config/configAppearance.qml
index b9f4c8a..52da327 100644
--- a/package/contents/ui/config/configAppearance.qml
+++ b/package/contents/ui/config/configAppearance.qml
@@ -58,31 +58,6 @@ Item {
     property int cfg_dateShadowXOffset
     property int cfg_dateShadowYOffset
 
-
-    function fixFontFamilyChange(id, comboBox) {
-        // HACK by the time we populate our model and/or the ComboBox is finished the value is still undefined
-        if (id) {
-            for (var i = 0, j = fontsModel.count; i < j; ++i) {
-                if (fontsModel.get(i).value === id) {
-                    comboBox.currentIndex = i
-                    break
-                }
-            }
-        }
-    }
-
-    onCfg_clockFontFamilyChanged: {
-        fixFontFamilyChange(cfg_clockFontFamily, clockFontFamilyComboBox)
-    }
-
-    onCfg_dayFontFamilyChanged: {
-        fixFontFamilyChange(cfg_dayFontFamily, dayFontFamilyComboBox)
-    }
-
-    onCfg_dateFontFamilyChanged: {
-        fixFontFamilyChange(cfg_dateFontFamily, dateFontFamilyComboBox)
-    }
-
     ListModel {
         id: fontsModel
         Component.onCompleted: {
diff --git a/package/contents/ui/lib/FontConfig.qml b/package/contents/ui/lib/FontConfig.qml
index efa6062..d74cbd9 100644
--- a/package/contents/ui/lib/FontConfig.qml
+++ b/package/contents/ui/lib/FontConfig.qml
@@ -44,7 +44,16 @@ QtLayouts.RowLayout {
         QtLayouts.Layout.minimumWidth: Kirigami.Units.gridUnit * 10
         model: fontModel
         textRole: "text"
-        currentIndex: fontValue
+        currentIndex: getIdFromModel()
+
+        function getIdFromModel(){
+            for(var i = 0; i < model.count; i++){
+                if(model.get(i).value === fontValue){
+                    return i;
+                }
+            }
+            return 0;
+        }
 
         onCurrentIndexChanged: {
             var current = model.get(currentIndex)