diff --git a/data/widgets/select_accelerator.xml b/data/widgets/select_accelerator.xml
index 551ea7311..44138e766 100644
--- a/data/widgets/select_accelerator.xml
+++ b/data/widgets/select_accelerator.xml
@@ -3,7 +3,7 @@
 <gui>
   <window id="select_accelerator" text="Keyboard Shortcut">
     <vbox expansive="true">
-      <grid columns="3">
+      <grid columns="3" expansive="true">
         <label text="Key:" />
         <hbox id="key_placeholder" expansive="true" />
         <button text="Clear" id="clear_button" width="60" />
@@ -17,7 +17,8 @@
           <check text="Space" id="space" />
         </hbox>
 
-        <label text="" id="assigned_to" cell_hspan="3" />
+        <label text="Assigned to:" />
+        <label text="" id="assigned_to" cell_hspan="2" />
       </grid>
 
       <separator horizontal="true" />
diff --git a/src/app/ui/select_accelerator.cpp b/src/app/ui/select_accelerator.cpp
index d483827d3..e5ee3e9e1 100644
--- a/src/app/ui/select_accelerator.cpp
+++ b/src/app/ui/select_accelerator.cpp
@@ -35,6 +35,7 @@ using namespace ui;
 class SelectAccelerator::KeyField : public ui::Entry {
 public:
   KeyField(const Accelerator& accel) : ui::Entry(256, "") {
+    setExpansive(true);
     setFocusMagnet(true);
     setAccel(accel);
   }
@@ -175,7 +176,7 @@ void SelectAccelerator::updateAssignedTo()
     }
   }
 
-  assignedTo()->setText("Assigned to: " + res);
+  assignedTo()->setText(res);
 }
 
 } // namespace app