diff --git a/data/interfaces/xfpm-settings.ui b/data/interfaces/xfpm-settings.ui
index bffc31dda0ba669a92173ac2fc24aaa3a8b80eae..83f229b7968e9daa44ba2da3261a422abe884b43 100644
--- a/data/interfaces/xfpm-settings.ui
+++ b/data/interfaces/xfpm-settings.ui
@@ -167,6 +167,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
+                        <property name="tooltip-text" translatable="yes">Disable Display Power Management Signaling (DPMS), e.g don't attempt to switch off the display or put it in sleep mode.</property>
                         <signal name="toggled" handler="dpms_toggled_cb"/>
                       </object>
                       <packing>
@@ -357,6 +358,8 @@
                        <packing>
                         <property name="left_attach">2</property>
                         <property name="top_attach">4</property>
+                        <property name="x_options">GTK_EXPAND</property>
+                        <property name="y_options">GTK_EXPAND</property>
                        </packing>
                      </child>
                      <child>
@@ -370,6 +373,8 @@
                        <packing>
                         <property name="left_attach">3</property>
                         <property name="top_attach">4</property>
+                        <property name="x_options">GTK_EXPAND</property>
+                        <property name="y_options">GTK_EXPAND</property>
                        </packing>
                      </child>
                      <child>
diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
index def5ec95f19057916494a7e5edb684a6b352f897..194d29da39ed0ccdee1a1b82599b356182c1ca0e 100644
--- a/settings/xfpm-settings.c
+++ b/settings/xfpm-settings.c
@@ -1188,8 +1188,6 @@ xfpm_settings_general (XfconfChannel *channel, gboolean auth_hibernate,
     val = xfconf_channel_get_bool (channel, PROPERTIES_PREFIX DPMS_ENABLED_CFG, TRUE);
     
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dpms), val);
-    gtk_widget_set_tooltip_text (dpms, _("Disable Display Power Management Signaling (DPMS), "\
-				         "e.g don't attempt to switch off the display or put it in sleep mode."));
 #else
     gtk_widget_hide (dpms);
 #endif