diff --git a/application/libraries/Grocery_CRUD.php b/application/libraries/Grocery_CRUD.php
index 53df38ed..22d01fce 100755
--- a/application/libraries/Grocery_CRUD.php
+++ b/application/libraries/Grocery_CRUD.php
@@ -2217,8 +2217,18 @@ protected function get_string_input($field_info,$value)
 		$value = !is_string($value) ? '' : str_replace('"',""",$value);
 
 		$extra_attributes = '';
-		if(!empty($field_info->db_max_length))
-			$extra_attributes .= "maxlength='{$field_info->db_max_length}'";
+		if (!empty($field_info->db_max_length)) {
+
+            if (in_array($field_info->type, array("decimal", "float"))) {
+                $decimal_lentgh = explode(",", $field_info->db_max_length);
+                $decimal_lentgh = ((int)$decimal_lentgh[0]) + 1;
+
+                $extra_attributes .= "maxlength='" . $decimal_lentgh . "'";
+            } else {
+                $extra_attributes .= "maxlength='{$field_info->db_max_length}'";
+            }
+
+        }
 		$input = "<input id='field-{$field_info->name}' class='form-control' name='{$field_info->name}' type='text' value=\"$value\" $extra_attributes />";
 		return $input;
 	}
diff --git a/change_log.txt b/change_log.txt
index 767024d1..3ee04b35 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,3 +1,5 @@
+v 1.5.3
+   #141 - Max length for decimal numbers (pull request from @dodge107)
 v 1.5.2
    Add lithuanian language - translated by alex@gnosi.lt
    Fix compatibility issues with Codeigniter 3