diff --git a/srcs/juloo.keyboard2/ClipboardHistoryCheckBox.java b/srcs/juloo.keyboard2/ClipboardHistoryCheckBox.java
index 9842058..54d624e 100644
--- a/srcs/juloo.keyboard2/ClipboardHistoryCheckBox.java
+++ b/srcs/juloo.keyboard2/ClipboardHistoryCheckBox.java
@@ -11,6 +11,7 @@ final class ClipboardHistoryCheckBox extends CheckBox
   public ClipboardHistoryCheckBox(Context ctx, AttributeSet attrs)
   {
     super(ctx, attrs);
+    setChecked(Config.globalConfig().clipboard_history_enabled);
     setOnCheckedChangeListener(this);
   }
 
diff --git a/srcs/juloo.keyboard2/ClipboardHistoryService.java b/srcs/juloo.keyboard2/ClipboardHistoryService.java
index 2c83ba6..1ce644c 100644
--- a/srcs/juloo.keyboard2/ClipboardHistoryService.java
+++ b/srcs/juloo.keyboard2/ClipboardHistoryService.java
@@ -30,11 +30,9 @@ public final class ClipboardHistoryService
 
   public static void set_history_enabled(boolean e)
   {
+    Config.globalConfig().set_clipboard_history_enabled(e);
     if (_service == null)
       return;
-    Config.globalPrefs().edit()
-      .putBoolean("clipboard_history_enabled", e)
-      .commit();
     if (e)
       _service.add_current_clip();
     else
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index bb79bb8..321ed9c 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -207,6 +207,12 @@ public final class Config
     e.apply();
   }
 
+  public void set_clipboard_history_enabled(boolean e)
+  {
+    clipboard_history_enabled = e;
+    _prefs.edit().putBoolean("clipboard_history_enabled", e).commit();
+  }
+
   KeyValue action_key()
   {
     // Update the name to avoid caching in KeyModifier