diff --git a/src/app/pages/emoji.rs b/src/app/pages/emoji.rs
index 6e17eb8..797b854 100644
--- a/src/app/pages/emoji.rs
+++ b/src/app/pages/emoji.rs
@@ -32,6 +32,8 @@ pub fn emoji_page(
         let mut emoji_row_element = Row::new().spacing(10);
         for emoji in emoji_row {
             let theme_clone = tile_theme.clone();
+
+            // Emoji text
             let element_column = Column::new().push(
                 Text::new(emoji.display_name.clone())
                     .font(tile_theme.font())
@@ -43,6 +45,8 @@ pub fn emoji_page(
             );
             let value = tile_theme.clone();
             let value_two = tile_theme.clone();
+
+            // Emoji icon + Emoji container
             emoji_row_element = emoji_row_element.push(tooltip(
                 container(
                     Button::new(element_column)
diff --git a/src/app/tile/elm.rs b/src/app/tile/elm.rs
index c9d877c..4f9acb5 100644
--- a/src/app/tile/elm.rs
+++ b/src/app/tile/elm.rs
@@ -146,8 +146,11 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
             Page::Settings => 0,
         };
 
+        // This determines the height of the scrollable window
         let height = match tile.page {
             Page::ClipboardHistory | Page::Settings => 385,
+            // Height of each emoji is EMOJI_HEIGHT + 20 for padding
+            Page::EmojiSearch => std::cmp::min(((tile.results.len() + 6 - 1) / 6) * 90, 290),
             _ => std::cmp::min(tile.results.len() * 60, 290),
         };