3 files changed, 10 insertions, 4 deletions
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp
index 16d1b320b7..41f4beb1c9 100644
--- a/scene/gui/scroll_bar.cpp
+++ b/scene/gui/scroll_bar.cpp
@@ -106,9 +106,9 @@ void ScrollBar::_gui_input(Ref<InputEvent> p_event) {
 			if (ofs < grabber_ofs) {
 
 				if (scrolling) {
-					target_scroll = target_scroll - get_page();
+					target_scroll = CLAMP(target_scroll - get_page(), get_min(), get_max() - get_page());
 				} else {
-					target_scroll = get_value() - get_page();
+					target_scroll = CLAMP(get_value() - get_page(), get_min(), get_max() - get_page());
 				}
 
 				if (smooth_scroll_enabled) {
@@ -130,9 +130,9 @@ void ScrollBar::_gui_input(Ref<InputEvent> p_event) {
 				update();
 			} else {
 				if (scrolling) {
-					target_scroll = target_scroll + get_page();
+					target_scroll = CLAMP(target_scroll + get_page(), get_min(), get_max() - get_page());
 				} else {
-					target_scroll = get_value() + get_page();
+					target_scroll = CLAMP(get_value() + get_page(), get_min(), get_max() - get_page());
 				}
 
 				if (smooth_scroll_enabled) {
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 2ca4c81319..d30e0b9f25 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -4266,6 +4266,10 @@ bool TextEdit::is_insert_mode() const {
 	return insert_mode;
 }
 
+bool TextEdit::is_insert_text_operation() {
+	return (current_op.type == TextOperation::TYPE_INSERT);
+}
+
 uint32_t TextEdit::get_version() const {
 	return current_op.version;
 }
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index 68ef559f46..7e61c4e8b1 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -386,6 +386,8 @@ public:
 	void begin_complex_operation();
 	void end_complex_operation();
 
+	bool is_insert_text_operation();
+
 	void set_text(String p_text);
 	void insert_text_at_cursor(const String &p_text);
 	void insert_at(const String &p_text, int at);