2 files changed, 9 insertions, 10 deletions
diff --git a/WebContent/VAADIN/themes/base/base.scss b/WebContent/VAADIN/themes/base/base.scss
index 42047e9af5..a16b063ba8 100644
--- a/WebContent/VAADIN/themes/base/base.scss
+++ b/WebContent/VAADIN/themes/base/base.scss
@@ -47,16 +47,6 @@
 	overflow: hidden;
 }
 
-/* Temporarily moved here to make drag'n'drop work before #10384 is fixed */
-.v-drag-element {
-        z-index: 60000;
-        /* override any other position: properties */
-        position: absolute !important;
-        opacity: 0.5;
-        filter: alpha(opacity=50);
-        cursor: default;
-}
-
 @mixin base {
 	// @include base-app;
 	
diff --git a/WebContent/VAADIN/themes/base/common/common.scss b/WebContent/VAADIN/themes/base/common/common.scss
index 9162e64a89..ac9154d2dc 100644
--- a/WebContent/VAADIN/themes/base/common/common.scss
+++ b/WebContent/VAADIN/themes/base/common/common.scss
@@ -204,6 +204,15 @@ body &.v-app-loading {
 	padding: 2px;
 }
 
+.v-drag-element {
+	z-index: 60000;
+	/* override any other position: properties */
+	position: absolute !important;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+	cursor: default;
+}
+
 .v-clip {
 	overflow: hidden;
 }