diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp
index 09c6a77b42e..8652aab6492 100644
--- a/scene/gui/label.cpp
+++ b/scene/gui/label.cpp
@@ -488,9 +488,9 @@ void Label::regenerate_word_cache() {
 	if (!autowrap) {
 		minsize.width=width;
 		if (max_lines_visible > 0 && line_count > max_lines_visible) {
-			minsize.height=(font->get_height()+line_spacing)*max_lines_visible;
+			minsize.height=(font->get_height() * max_lines_visible) + (line_spacing * (max_lines_visible - 1));
 		} else {
-			minsize.height=(font->get_height()+line_spacing)*line_count;
+			minsize.height=(font->get_height() * line_count)+(line_spacing * (line_count - 1));
 		}
 	}
 
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp
index ca2d09dd27f..44cc7984473 100644
--- a/scene/gui/line_edit.cpp
+++ b/scene/gui/line_edit.cpp
@@ -454,7 +454,7 @@ void LineEdit::_notification(int p_what) {
 				} break;
 			}
 
-			int ofs_max=width-style->get_minimum_size().width;
+			int ofs_max=width-style->get_minimum_size().width+x_ofs;
 			int char_ofs=window_pos;
 
 			int y_area=height-style->get_minimum_size().height;
@@ -799,8 +799,7 @@ Size2 LineEdit::get_minimum_size() const {
 	Ref<Font> font=get_font("font");
 
 	Size2 min=style->get_minimum_size();
-	min.height+=font->get_height();
-	min.width+=get_constant("minimum_spaces")*font->get_char_size(' ').x;
+	min+=font->get_string_size(this->text);
 
 	return min;
 }