diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js
index 9edc9283e..8fa8bfd0d 100644
--- a/client/components/lists/listHeader.js
+++ b/client/components/lists/listHeader.js
@@ -82,7 +82,7 @@ BlazeComponent.extendComponent({
 
   showCardsCountForList(count) {
     const limit = this.limitToShowCardsCount();
-    return limit > 0 && count > limit;
+    return limit >= 0 && count > limit;
   },
 
   events() {
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index d3ef6e3ff..e095e5d3b 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -143,7 +143,7 @@ template(name="changeSettingsPopup")
         label.bold.clear
           i.fa.fa-sort-numeric-asc
           | {{_ 'show-cards-minimum-count'}}
-        input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false")
+        input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="-1")
         label.bold.clear
           i.fa.fa-calendar
           | {{_ 'start-day-of-week'}}
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index 2ef316990..59c12d1a6 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -271,6 +271,13 @@ Template.changeSettingsPopup.helpers({
 });
 
 Template.changeSettingsPopup.events({
+  'keypress/paste #show-cards-count-at'() {
+    let keyCode = event.keyCode;
+    let charCode = String.fromCharCode(keyCode);
+    let regex = new RegExp("[-0-9]");
+    let ret = regex.test(charCode);
+    return ret;
+  },
   'click .js-toggle-desktop-drag-handles'() {
     currentUser = Meteor.user();
     if (currentUser) {
@@ -293,7 +300,7 @@ Template.changeSettingsPopup.events({
   },
   'click .js-apply-user-settings'(event, templateInstance) {
     event.preventDefault();
-    const minLimit = parseInt(
+    let minLimit = parseInt(
       templateInstance.$('#show-cards-count-at').val(),
       10,
     );
@@ -302,6 +309,9 @@ Template.changeSettingsPopup.events({
       10,
     );
     const currentUser = Meteor.user();
+    if (isNaN(minLimit) || minLimit < -1) {
+      minLimit = -1;
+    }
     if (!isNaN(minLimit)) {
       if (currentUser) {
         Meteor.call('changeLimitToShowCardsCount', minLimit);