diff --git a/changes.txt b/changes.txt
index 36a66db0..753f4d24 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,8 @@
 Changes in 1.8 (??.??.2011)
 
- - Allow caching cursor position on X11 to work around slow XQueryPointer calls.
+ - Fix diplay bux in the attribute-panel of the GUIEditor. Fixes bug 3517314 (thx @Darkcoder  for reporting).
+
+ - Allow caching cursor position on X11 to work around slow XQueryPointer calls (thx @Hendu for reporting+patch proposal)
 
  - Struct packing works now with gcc 4.7 changes on MinGW (thx @Sudi for reporting).
 
diff --git a/tools/GUIEditor/CGUIPanel.cpp b/tools/GUIEditor/CGUIPanel.cpp
index 825175bb..7d84076f 100644
--- a/tools/GUIEditor/CGUIPanel.cpp
+++ b/tools/GUIEditor/CGUIPanel.cpp
@@ -198,7 +198,7 @@ bool CGUIPanel::OnEvent(const SEvent &event)
 void CGUIPanel::moveInnerPane()
 {
 	core::dimension2d<s32> dim = InnerPane->getAbsolutePosition().getSize();
-	core::position2d<s32> newpos(-HScrollBar->getPos(), -VScrollBar->getPos());
+	core::position2d<s32> newpos(HScrollBar->isVisible() ? -HScrollBar->getPos() : 0 , VScrollBar->isVisible() ? -VScrollBar->getPos() : 0);
 	core::rect<s32> r(newpos, newpos + dim);
 	InnerPane->setRelativePosition(r);
 }