From 5e3131a8f73e830113291a2e1ea512fb650b6a11 Mon Sep 17 00:00:00 2001
From: Johannes Plunien <plu@pqpq.de>
Date: Sun, 19 Apr 2015 15:19:53 +0200
Subject: [PATCH] Fix sidepanel stickyness

Fix #1493
---
 root/static/js/toolbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/static/js/toolbar.js b/root/static/js/toolbar.js
index d8ac998599..618b651db4 100644
--- a/root/static/js/toolbar.js
+++ b/root/static/js/toolbar.js
@@ -4,7 +4,7 @@ if( !/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) {
         var topRow = $('.main-content').first();
         if (!el.length) return;
         var height = el.height();
-        var content = $("div.content");
+        var content = $("div.content").height() > $("#right-panel").height() ? $("div.content") : $('#right-panel');
         if(height > content.height()) return;
 
         function alignSidebar(e) {