1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index 4f1fd5dfca..f0555408dd 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -68,9 +68,9 @@ LLPanelEmojiComplete::LLPanelEmojiComplete(const LLPanelEmojiComplete::Params& p
     {
         LLScrollbar::Params sbparams;
         sbparams.orientation(LLScrollbar::VERTICAL);
-        sbparams.doc_size(mTotalEmojis);
+        sbparams.doc_size(static_cast<S32>(mTotalEmojis));
         sbparams.doc_pos(0);
-        sbparams.page_size(mVisibleEmojis);
+        sbparams.page_size(static_cast<S32>(mVisibleEmojis));
         sbparams.change_callback([this](S32 index, LLScrollbar*) { onScrollbarChange(index); });
         mScrollbar = LLUICtrlFactory::create<LLScrollbar>(sbparams);
         addChild(mScrollbar);
@@ -463,6 +463,7 @@ void LLPanelEmojiComplete::updateConstraints()
     {
         mEmojiHeight = mRenderRect.getHeight();
         mRenderRect.stretch((mRenderRect.getWidth() - static_cast<S32>(mVisibleEmojis) * mEmojiWidth) / -2, 0);
+        mRenderRect.translate(-mRenderRect.mLeft, 0); // Left align emojis to fix hitboxes
     }
 
     updateScrollPos();