diff --git a/src/com/cherish/settings/fragments/CarrierLabel.java b/src/com/cherish/settings/fragments/CarrierLabel.java
index 30875a6..3811a1a 100644
--- a/src/com/cherish/settings/fragments/CarrierLabel.java
+++ b/src/com/cherish/settings/fragments/CarrierLabel.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
+import android.text.InputFilter;
 import android.text.Spannable;
 import android.text.TextUtils;
 import android.widget.EditText;
@@ -74,7 +75,9 @@ public class CarrierLabel extends SettingsPreferenceFragment
             alert.setMessage(R.string.custom_carrier_label_explain);
             // Set an EditText view to get user input
             final EditText input = new EditText(getActivity());
+            int maxLength = 25;
             input.setText(TextUtils.isEmpty(mCarrierLabelText) ? "" : mCarrierLabelText);
+            input.setFilters(new InputFilter[] {new InputFilter.LengthFilter(maxLength)});
             input.setSelection(input.getText().length());
             alert.setView(input);
             alert.setPositiveButton(getString(android.R.string.ok),