diff --git a/kivy/uix/textinput.py b/kivy/uix/textinput.py
index 74d8ae5b5..64b2aecb6 100644
--- a/kivy/uix/textinput.py
+++ b/kivy/uix/textinput.py
@@ -1,4 +1,4 @@
-# -*- encoding: utf8 -*-
+# -*- encoding: utf-8 -*-
 '''
 Text Input
 ==========
@@ -2561,7 +2561,7 @@ class TextInput(Widget):
 
     def _get_min_height(self):
         return (len(self._lines) * (self.line_height + self.line_spacing)
-                + self.padding[0] + self.padding[2])
+                + self.padding[1] + self.padding[3])
 
     minimum_height = AliasProperty(_get_min_height, None,
                                    bind=('_lines', 'line_spacing', 'padding',