diff --git a/src/Admin.php b/src/Admin.php
index 6bdacbb7..d1a8c400 100644
--- a/src/Admin.php
+++ b/src/Admin.php
@@ -418,7 +418,7 @@ protected function fireBootedCallbacks()
 
     public static function asset($asset)
     {
-        return url('/vendor/open-admin/'.$asset);
+        return admin_asset('/vendor/open-admin/'.$asset);
     }
 
     public static function js_trans()
diff --git a/src/Form.php b/src/Form.php
index f61e7990..cf8e7636 100644
--- a/src/Form.php
+++ b/src/Form.php
@@ -185,6 +185,10 @@ public function pushField(Field $field): self
      */
     public function model(): Model
     {
+        if ($this->model instanceof Actions\Interactor\Form) {
+            return $this->model->getRow();
+        }
+
         return $this->model;
     }