2 files changed, 30 insertions, 4 deletions

diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp
index 0dd02a982c..e3fa1fdcb7 100644
--- a/scene/2d/sprite.cpp
+++ b/scene/2d/sprite.cpp
@@ -281,13 +281,39 @@ bool Sprite::_edit_is_selected_on_click(const Point2 &p_point, double p_toleranc
 	Rect2 src_rect, dst_rect;
 	bool filter_clip;
 	_get_rects(src_rect, dst_rect, filter_clip);
+	dst_rect.size = dst_rect.size.abs();
 
 	if (!dst_rect.has_point(p_point))
 		return false;
 
-	Vector2 q = ((p_point - dst_rect.position) / dst_rect.size) * src_rect.size + src_rect.position;
+	Vector2 q = (p_point - dst_rect.position) / dst_rect.size;
+	if (hflip)
+		q.x = 1.0f - q.x;
+	if (vflip)
+		q.y = 1.0f - q.y;
+	q = q * src_rect.size + src_rect.position;
+
+	Ref<Image> image;
+	Ref<AtlasTexture> atlasTexture = texture;
+	if (atlasTexture.is_null()) {
+		image = texture->get_data();
+	} else {
+		ERR_FAIL_COND_V(atlasTexture->get_atlas().is_null(), false);
+
+		image = atlasTexture->get_atlas()->get_data();
+
+		Rect2 region = atlasTexture->get_region();
+		Rect2 margin = atlasTexture->get_margin();
+
+		q -= margin.position;
+
+		if ((q.x > region.size.width) || (q.y > region.size.height)) {
+			return false;
+		}
+
+		q += region.position;
+	}
 
-	Ref<Image> image = texture->get_data();
 	ERR_FAIL_COND_V(image.is_null(), false);
 
 	image->lock();
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index c2b8a7dfab..9aac5137bc 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -130,8 +130,8 @@ void GridContainer::_notification(int p_what) {
 			}
 
 			// Finally, fit the nodes
-			int col_expand = remaining_space.width / col_expanded.size();
-			int row_expand = remaining_space.height / row_expanded.size();
+			int col_expand = col_expanded.size() > 0 ? remaining_space.width / col_expanded.size() : 0;
+			int row_expand = row_expanded.size() > 0 ? remaining_space.height / row_expanded.size() : 0;
 
 			int col_ofs = 0;
 			int row_ofs = 0;