2 files changed, 5 insertions, 6 deletions
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index d6dfed11df..e7fdd3fe84 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -204,12 +204,6 @@ body &.v-app-loading {
 	padding: 2px;
 }
 
-/* Fix for IE9 caret bug #11152 */
-input, 
-textarea {
-	position: relative;
-}
-
 .v-drag-element {
 	z-index: 60000;
 	/* override any other position: properties */
diff --git a/WebContent/VAADIN/themes/base/layout/layout.scss b/WebContent/VAADIN/themes/base/layout/layout.scss
index d49b2ad0dd..049c527518 100644
--- a/WebContent/VAADIN/themes/base/layout/layout.scss
+++ b/WebContent/VAADIN/themes/base/layout/layout.scss
@@ -105,6 +105,11 @@ div.v-layout.v-horizontal.v-widget {
 	height: 100%;
 }
 
+/* Workaround for IE8+IE9 bug where clicking inside an input area which is inside a div with negative margin causes cursor position to jump to wrong position. See #11152 */
+.v-horizontal > .v-expand > .v-slot {
+	position: relative;
+}
+
 .v-vertical > .v-spacing,
 .v-vertical > .v-expand > .v-spacing {
 	width: 0;