diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/Widget.js b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/Widget.js
index 62bc937..2e6f8f5 100644
--- a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/Widget.js
+++ b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/Widget.js
@@ -3116,7 +3116,12 @@
         if (value) {
           vFocusRoot.setFocusedChild(this);
           this._visualizeFocus();
-          this.scrollIntoView();
+          if( this.getWidth() < rwt.html.Viewport.getWidth() ) {
+            this.scrollIntoViewX();
+          }
+          if( this.getHeight() < rwt.html.Viewport.getHeight() ) {
+            this.scrollIntoViewY();
+          }
         } else {
           if (vFocusRoot.getFocusedChild() == this) {
             vFocusRoot.setFocusedChild(null);