diff --git a/lib/pages/chat/input_bar.dart b/lib/pages/chat/input_bar.dart
index ecd00c2cd..4ed71518f 100644
--- a/lib/pages/chat/input_bar.dart
+++ b/lib/pages/chat/input_bar.dart
@@ -263,6 +263,8 @@ class InputBar extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.center,
           children: <Widget>[
             MxcImage(
+              // ensure proper ordering ...
+              key: ValueKey(suggestion['name']),
               uri: suggestion['mxc'] is String
                   ? Uri.parse(suggestion['mxc'] ?? '')
                   : null,
diff --git a/lib/pages/settings_emotes/settings_emotes_view.dart b/lib/pages/settings_emotes/settings_emotes_view.dart
index faee4669f..8901143ef 100644
--- a/lib/pages/settings_emotes/settings_emotes_view.dart
+++ b/lib/pages/settings_emotes/settings_emotes_view.dart
@@ -212,16 +212,20 @@ class EmotesSettingsView extends StatelessWidget {
 
 class _EmoteImage extends StatelessWidget {
   final Uri mxc;
+
   const _EmoteImage(this.mxc);
 
   @override
   Widget build(BuildContext context) {
     const size = 38.0;
-    return MxcImage(
-      uri: mxc,
-      fit: BoxFit.contain,
-      width: size,
-      height: size,
+    return SizedBox.square(
+      dimension: size,
+      child: MxcImage(
+        uri: mxc,
+        fit: BoxFit.contain,
+        width: size,
+        height: size,
+      ),
     );
   }
 }