diff --git a/config/settings/settings.conf b/config/settings/settings.conf
index 91f8a567..12794596 100644
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@@ -75,6 +75,7 @@ interruptOnKeyPress=False
 [general]
 debugLevel=0
 punctuationLevel=1
+numberOfClipboards=10
 # define the current fenrir key
 fenrirKeys=KEY_KP0
 
diff --git a/config/settings/settings.conf.orig b/config/settings/settings.conf.orig
index 91f8a567..12794596 100644
--- a/config/settings/settings.conf.orig
+++ b/config/settings/settings.conf.orig
@@ -75,6 +75,7 @@ interruptOnKeyPress=False
 [general]
 debugLevel=0
 punctuationLevel=1
+numberOfClipboards=10
 # define the current fenrir key
 fenrirKeys=KEY_KP0
 
diff --git a/config/settings/settings.conf.storm b/config/settings/settings.conf.storm
index 82378be3..319669d4 100644
--- a/config/settings/settings.conf.storm
+++ b/config/settings/settings.conf.storm
@@ -36,6 +36,7 @@ interruptOnKeyPress=False
 [general]
 debugLevel=0
 punctuationLevel=1
+numberOfClipboards=10
 fenrirKeys=KEY_KP0
 
 [promote]
diff --git a/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py b/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py
index c6154c39..984f6eb1 100644
--- a/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py
+++ b/src/fenrir-package/commands/commands/copy_marked_to_clipboard.py
@@ -21,7 +21,7 @@ class command():
 
         marked = mark_utils.getTextBetweenMarks(startMark, endMark, environment['screenData']['newContentText'])
 
-        environment['commandBuffer']['clipboard'] = [marked] + environment['commandBuffer']['clipboard'][:9]
+        environment['commandBuffer']['clipboard'] = [marked] + environment['commandBuffer']['clipboard'][:environment['runtime']['settingsManager'].getSettingAsFloat(environment, 'general', 'numberOfClipboards') -1]
         environment['commandBuffer']['currClipboard'] = 0
         environment['commandBuffer']['Marks']['1'] = None
         environment['commandBuffer']['Marks']['2'] = None
diff --git a/src/fenrir-package/core/settings.py b/src/fenrir-package/core/settings.py
index b132defc..ceed745c 100644
--- a/src/fenrir-package/core/settings.py
+++ b/src/fenrir-package/core/settings.py
@@ -32,6 +32,7 @@ settings = {
   'keyboardLayout': "desktop",
   'debugLevel': debug.debugLevel.DEACTIVE,
   'punctuationLevel': 1,
+  'numberOfClipboards': 10,
   'fenrirKeys':['82'],
 },
 'promote':{