diff --git a/src/settings.c b/src/settings.c
index 08f76b9663fc1da67017c46328e2a95a7e767741..73d6b2d5c2b8974c74f7a6c23f63772603d79b5a 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -224,11 +224,13 @@ phosh_settings_constructed (GObject *object)
   PhoshSettingsPrivate *priv = phosh_settings_get_instance_private (self);
   GtkWidget *image;
   GtkAdjustment *adj;
+  gint width;
 
   /* window properties */
+  phosh_shell_get_usable_area (phosh_shell_get_default (), NULL, NULL, &width, NULL);
   gtk_window_set_title (GTK_WINDOW (self), "phosh settings");
   gtk_window_set_decorated (GTK_WINDOW (self), FALSE);
-  gtk_window_resize (GTK_WINDOW (self), 100, 100);
+  gtk_window_resize (GTK_WINDOW (self), width, 100);
   gtk_widget_realize(GTK_WIDGET (self));
 
   gtk_range_set_range (GTK_RANGE (priv->scale_brightness), 0, 100);
diff --git a/src/ui/settings-menu.ui b/src/ui/settings-menu.ui
index 6768679e9abaae1d6e48e6843744896b77dd1755..14dc67718b8227a624d6692614adfb5b195e5ce0 100644
--- a/src/ui/settings-menu.ui
+++ b/src/ui/settings-menu.ui
@@ -2,6 +2,7 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
+  <requires lib="libhandy" version="0.0"/>
   <template class="PhoshSettings" parent="GtkWindow">
     <property name="width_request">250</property>
     <property name="can_focus">False</property>
@@ -9,136 +10,140 @@
       <placeholder/>
     </child>
     <child>
-      <object class="GtkBox" id="box_settings">
+      <object class="HdyColumn">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">10</property>
-        <property name="margin_right">10</property>
-        <property name="margin_top">10</property>
-        <property name="margin_bottom">10</property>
-        <property name="orientation">vertical</property>
+        <property name="maximum_width">350</property>
         <child>
-          <object class="GtkBox">
+          <object class="GtkBox" id="box_settings">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="margin_left">10</property>
+            <property name="margin_right">10</property>
+            <property name="margin_top">10</property>
+            <property name="margin_bottom">10</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkImage">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_right">10</property>
-                <property name="icon_name">display-brightness-symbolic</property>
+                <property name="margin_top">5</property>
+                <property name="margin_bottom">5</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_right">10</property>
+                    <property name="icon_name">display-brightness-symbolic</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScale" id="scale_brightness">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="round_digits">1</property>
+                    <property name="draw_value">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkScale" id="scale_brightness">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="round_digits">1</property>
-                <property name="draw_value">False</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkListBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="selection_mode">none</property>
-            <property name="activate_on_single_click">False</property>
             <child>
-              <object class="GtkListBoxRow">
+              <object class="GtkListBox">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activatable">False</property>
-                <property name="selectable">False</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="selection_mode">none</property>
+                <property name="activate_on_single_click">False</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkListBoxRow">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="valign">center</property>
+                    <property name="can_focus">True</property>
+                    <property name="activatable">False</property>
+                    <property name="selectable">False</property>
                     <child>
-                      <object class="GtkLabel">
-                        <property name="height_request">32</property>
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="margin_left">10</property>
-                        <property name="margin_start">10</property>
-                        <property name="margin_top">8</property>
-                        <property name="margin_bottom">8</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes">Rotation</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSwitch" id="btn_rotation">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="halign">end</property>
                         <property name="valign">center</property>
-                        <property name="margin_right">12</property>
-                        <property name="margin_end">12</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="height_request">32</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="margin_left">10</property>
+                            <property name="margin_start">10</property>
+                            <property name="margin_top">8</property>
+                            <property name="margin_bottom">8</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Rotation</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSwitch" id="btn_rotation">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="halign">end</property>
+                            <property name="valign">center</property>
+                            <property name="margin_right">12</property>
+                            <property name="margin_end">12</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <object class="GtkButtonBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">center</property>
                 <property name="layout_style">start</property>
                 <child>
                   <object class="GtkButton" id="btn_settings">
+                    <property name="width_request">56</property>
+                    <property name="height_request">56</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
                     <property name="margin_top">10</property>
                     <property name="relief">none</property>
                     <property name="always_show_image">True</property>
-                    <property name="width_request">56</property>
-                    <property name="height_request">56</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
                     <style>
                       <class name="circular"/>
                     </style>
@@ -150,17 +155,17 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="btn_shutdown">
+                  <object class="GtkButton" id="btn_lock_screen">
+                    <property name="width_request">56</property>
+                    <property name="height_request">56</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
                     <property name="margin_top">10</property>
                     <property name="relief">none</property>
                     <property name="always_show_image">True</property>
-                    <property name="width_request">56</property>
-                    <property name="height_request">56</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
                     <style>
                       <class name="circular"/>
                     </style>
@@ -168,21 +173,21 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="btn_lock_screen">
+                  <object class="GtkButton" id="btn_shutdown">
+                    <property name="width_request">56</property>
+                    <property name="height_request">56</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
                     <property name="margin_top">10</property>
                     <property name="relief">none</property>
                     <property name="always_show_image">True</property>
-                    <property name="width_request">56</property>
-                    <property name="height_request">56</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
                     <style>
                       <class name="circular"/>
                     </style>
@@ -190,22 +195,17 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
         </child>
       </object>
     </child>