diff --git a/Application/AppController.h b/Application/AppController.h
index bfc0f3bb2..d158249a9 100644
--- a/Application/AppController.h
+++ b/Application/AppController.h
@@ -97,4 +97,6 @@
 
 @property BOOL miniMode;
 
+@property (nonatomic) BOOL floatingMiniWindow;
+
 @end
diff --git a/Application/AppController.m b/Application/AppController.m
index 633a2d19f..6b03749da 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -177,6 +177,9 @@ void* kAppControllerContext = &kAppControllerContext;
 
     [self setToolbarStyle:[[NSUserDefaults standardUserDefaults] boolForKey:@"toolbarStyleFull"]];
 
+    [self setFloatingMiniWindow:[[NSUserDefaults standardUserDefaults]
+                                    boolForKey:@"floatingMiniWindow"]];
+
     // We need file tree view to restore its state here
     // so attempt to access file tree view controller's root view
     // to force it to read nib and create file tree view for us
@@ -606,4 +609,11 @@ void* kAppControllerContext = &kAppControllerContext;
     [miniWindow setContentSize:NSMakeSize(miniWindow.frame.size.width, 0)];
 }
 
+- (void)setFloatingMiniWindow:(BOOL)floatingMiniWindow {
+    _floatingMiniWindow = floatingMiniWindow;
+    [[NSUserDefaults standardUserDefaults] setBool:floatingMiniWindow forKey:@"floatingMiniWindow"];
+    NSWindowLevel level = floatingMiniWindow ? NSFloatingWindowLevel : NSNormalWindowLevel;
+    [miniWindow setLevel:level];
+}
+
 @end
diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 7ce9fb503..ef0c83a65 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -1373,6 +1373,12 @@ Gw
                                     </binding>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Show Mini Player On Top" keyEquivalent="T" id="lXN-EZ-xg0" userLabel="Show Mini Player On Top">
+                                <connections>
+                                    <binding destination="226" name="enabled" keyPath="miniMode" id="ftj-Rc-nqc"/>
+                                    <binding destination="226" name="value" keyPath="floatingMiniWindow" id="6rr-FP-Fw2"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="1642">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>