diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp
index 5edda1cb271..15332335368 100644
--- a/scene/gui/scroll_container.cpp
+++ b/scene/gui/scroll_container.cpp
@@ -421,6 +421,7 @@ void ScrollContainer::update_scrollbars() {
 	bool hide_scroll_v = !scroll_v || min.height <= size.height;
 	bool hide_scroll_h = !scroll_h || min.width <= size.width;
 
+	v_scroll->set_max(min.height);
 	if (hide_scroll_v) {
 
 		v_scroll->hide();
@@ -428,7 +429,6 @@ void ScrollContainer::update_scrollbars() {
 	} else {
 
 		v_scroll->show();
-		v_scroll->set_max(min.height);
 		if (hide_scroll_h) {
 			v_scroll->set_page(size.height);
 		} else {
@@ -438,6 +438,7 @@ void ScrollContainer::update_scrollbars() {
 		scroll.y = v_scroll->get_value();
 	}
 
+	h_scroll->set_max(min.width);
 	if (hide_scroll_h) {
 
 		h_scroll->hide();
@@ -445,7 +446,6 @@ void ScrollContainer::update_scrollbars() {
 	} else {
 
 		h_scroll->show();
-		h_scroll->set_max(min.width);
 		if (hide_scroll_v) {
 			h_scroll->set_page(size.width);
 		} else {