diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 6cba1f0e90..6b39e6ad84 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -562,6 +562,10 @@ void LLPreviewTexture::updateDimensions()
 			floater_target_height = mImage->getFullHeight() / 2 + 3 * CLIENT_RECT_VPAD + PREVIEW_BORDER + dimensions_panel->getRect().mTop + getChildView("desc")->getRect().getHeight();
 		}
 
+		// Preserve minimum floater size
+		floater_target_width = llmax(floater_target_width, getMinWidth());
+		floater_target_height = llmax(floater_target_height, getMinHeight());
+
 		// Resize floater
 		if (getHost())
 		{