diff --git a/Settings.ui b/Settings.ui
index 7bf6ce2..27cc1bc 100644
--- a/Settings.ui
+++ b/Settings.ui
@@ -2383,6 +2383,7 @@
                       <object class="GtkSpinButton" id="preview_size_spinbutton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="halign">end</property>
                         <property name="width_chars">4</property>
                         <property name="text">0</property>
                         <property name="adjustment">preview_size_adjustment</property>
@@ -2427,6 +2428,7 @@
                       <object class="GtkSpinButton" id="preview_padding_spinbutton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="halign">end</property>
                         <property name="width_chars">4</property>
                         <property name="text">50</property>
                         <property name="adjustment">preview_padding_adjustment</property>
diff --git a/windowPreview.js b/windowPreview.js
index 7db979c..91500c8 100644
--- a/windowPreview.js
+++ b/windowPreview.js
@@ -101,7 +101,7 @@ var PreviewMenu = Utils.defineClass({
         this._timeoutsHandler = new Utils.TimeoutsHandler();
         this._signalsHandler = new Utils.GlobalSignalsHandler();
 
-        Main.layoutManager.addChrome(this, { trackFullscreen: true, affectsInputRegion: false });
+        Main.layoutManager.addChrome(this, { affectsInputRegion: false });
         Main.layoutManager.trackChrome(this.menu, { affectsInputRegion: true });
         
         this._resetHiddenState();
@@ -166,7 +166,7 @@ var PreviewMenu = Utils.defineClass({
                 let alpha = Math.max(MIN_MENU_ALPHA, this._panelWrapper.dynamicTransparency.alpha);
     
                 this.menu.set_style('background: ' + Utils.getrgbaColor(this._panelWrapper.dynamicTransparency.backgroundColorRgb, alpha));
-                this.menu.show();
+                this.show();
 
                 this._refreshGlobals();
                 this.grab_key_focus();
@@ -375,7 +375,7 @@ var PreviewMenu = Utils.defineClass({
     },
 
     _resetHiddenState: function() {
-        this.menu.hide();
+        this.hide();
         this._setOpenedState(false);
         this.menu.opacity = 0;
         this.menu[this._translationProp] = this._translationOffset;