diff --git a/frontend/resources/styles/common/base.scss b/frontend/resources/styles/common/base.scss
index 1d7d21886..ee3ea713b 100644
--- a/frontend/resources/styles/common/base.scss
+++ b/frontend/resources/styles/common/base.scss
@@ -221,3 +221,7 @@ input[type=number]::-webkit-inner-spin-button,
     -webkit-appearance: none;
      margin: 0;
 }
+
+input[type=number] {
+  -moz-appearance: textfield;
+}
diff --git a/frontend/src/uxbox/main/ui/workspace/viewport.cljs b/frontend/src/uxbox/main/ui/workspace/viewport.cljs
index dae03277b..0b68030b0 100644
--- a/frontend/src/uxbox/main/ui/workspace/viewport.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/viewport.cljs
@@ -311,6 +311,7 @@
 
         on-drop
         (fn [event]
+          (dom/prevent-default event)
           (let [shape (dom/get-data-transfer event)
                 point (gpt/point (.-clientX event) (.-clientY event))
                 viewport-coord (translate-point-to-viewport point)
diff --git a/frontend/src/uxbox/util/dom.cljs b/frontend/src/uxbox/util/dom.cljs
index a0c882b07..ec491c9ee 100644
--- a/frontend/src/uxbox/util/dom.cljs
+++ b/frontend/src/uxbox/util/dom.cljs
@@ -165,11 +165,11 @@
 (defn set-data-transfer
   [event data]
   (let [data-string (ts/encode data)]
-    (-> event .-dataTransfer (.setData "text" data-string))))
+    (-> event .-dataTransfer (.setData "text/plain" data-string))))
 
 (defn get-data-transfer
   [event]
-  (let [data-string (-> event .-dataTransfer (.getData "text"))]
+  (let [data-string (-> event .-dataTransfer (.getData "text/plain"))]
     (ts/decode data-string)))
 
 (defn fullscreen?