diff --git a/data/widgets/palette_popup.xml b/data/widgets/palette_popup.xml
index 93078552f..362c52e90 100644
--- a/data/widgets/palette_popup.xml
+++ b/data/widgets/palette_popup.xml
@@ -5,7 +5,7 @@
     <label text="Available Palettes:" />
     <view id="view" expansive="true" />
     <hbox>
-      <button id="load_pal" text="&amp;Load" width="80" />
+      <button id="load_pal" text="&amp;Load" width="80" magnet="true" />
       <hbox expansive="true" />
       <button id="open_folder" text="Open &amp;Folder" width="60" />
     </hbox>
diff --git a/src/app/ui/palette_popup.cpp b/src/app/ui/palette_popup.cpp
index af2a1cf8f..50501617f 100644
--- a/src/app/ui/palette_popup.cpp
+++ b/src/app/ui/palette_popup.cpp
@@ -34,6 +34,7 @@ PalettePopup::PalettePopup()
 {
   setAutoRemap(false);
   setBorder(gfx::Border(4*guiscale()));
+  setEnterBehavior(EnterBehavior::DoNothingOnEnter);
 
   addChild(m_popup);
 
@@ -76,6 +77,8 @@ void PalettePopup::onLoadPal()
     CommandsModule::instance()->getCommandByName(CommandId::SetPalette));
   cmd->setPalette(palette);
   UIContext::instance()->executeCommand(cmd);
+
+  m_paletteListBox.requestFocus();
 }
 
 void PalettePopup::onOpenFolder()