diff --git a/modules/backend/formwidgets/MediaFinder.php b/modules/backend/formwidgets/MediaFinder.php
new file mode 100644
index 000000000..3688f94c7
--- /dev/null
+++ b/modules/backend/formwidgets/MediaFinder.php
@@ -0,0 +1,118 @@
+<?php namespace Backend\FormWidgets;
+
+use Lang;
+use ApplicationException;
+use System\Classes\MediaLibrary;
+use Backend\Classes\FormField;
+use Backend\Classes\FormWidgetBase;
+
+/**
+ * Media Finder
+ * Renders a record finder field.
+ *
+ *    image:
+ *        label: Some image
+ *        type: media
+ *        prompt: Click the %s button to find a user
+ *
+ * @package october\backend
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class MediaFinder extends FormWidgetBase
+{
+    //
+    // Configurable properties
+    //
+
+    /**
+     * @var string Prompt to display if no record is selected.
+     */
+    public $prompt = 'cms::lang.mediafinder.default_prompt';
+
+    /**
+     * @var string Display mode for the selection. Values: file, image.
+     */
+    public $mode = 'file';
+
+    /**
+     * @var int Preview image width
+     */
+    public $imageWidth = null;
+
+    /**
+     * @var int Preview image height
+     */
+    public $imageHeight = null;
+
+    //
+    // Object properties
+    //
+
+    /**
+     * @inheritDoc
+     */
+    protected $defaultAlias = 'media';
+
+    /**
+     * @inheritDoc
+     */
+    public function init()
+    {
+        $this->fillFromConfig([
+            'mode',
+            'prompt',
+            'imageWidth',
+            'imageHeight'
+        ]);
+
+        if ($this->formField->disabled) {
+            $this->previewMode = true;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function render()
+    {
+        $this->prepareVars();
+
+        return $this->makePartial('mediafinder');
+    }
+
+    /**
+     * Prepares the list data
+     */
+    public function prepareVars()
+    {
+        $value = $this->getLoadValue();
+        $this->vars['value'] = $value;
+        $this->vars['imageUrl'] = $value ? MediaLibrary::url($value) : '';
+        $this->vars['field'] = $this->formField;
+        $this->vars['prompt'] = str_replace('%s', '<i class="icon-folder"></i>', trans($this->prompt));
+        $this->vars['mode'] = $this->mode;
+        $this->vars['imageWidth'] = $this->imageWidth;
+        $this->vars['imageHeight'] = $this->imageHeight;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSaveValue($value)
+    {
+        if ($this->formField->disabled || $this->formField->hidden) {
+            return FormField::NO_SAVE_DATA;
+        }
+
+        return $value;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function loadAssets()
+    {
+        $this->addJs('js/mediafinder.js', 'core');
+        $this->addCss('css/mediafinder.css', 'core');
+    }
+}
diff --git a/modules/cms/formwidgets/mediafinder/assets/css/mediafinder.css b/modules/backend/formwidgets/mediafinder/assets/css/mediafinder.css
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/css/mediafinder.css
rename to modules/backend/formwidgets/mediafinder/assets/css/mediafinder.css
diff --git a/modules/cms/formwidgets/mediafinder/assets/js/mediafinder.js b/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/js/mediafinder.js
rename to modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.base.less b/modules/backend/formwidgets/mediafinder/assets/less/mediafinder.base.less
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/less/mediafinder.base.less
rename to modules/backend/formwidgets/mediafinder/assets/less/mediafinder.base.less
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less b/modules/backend/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
rename to modules/backend/formwidgets/mediafinder/assets/less/mediafinder.filesingle.less
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.imagesingle.less b/modules/backend/formwidgets/mediafinder/assets/less/mediafinder.imagesingle.less
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/less/mediafinder.imagesingle.less
rename to modules/backend/formwidgets/mediafinder/assets/less/mediafinder.imagesingle.less
diff --git a/modules/cms/formwidgets/mediafinder/assets/less/mediafinder.less b/modules/backend/formwidgets/mediafinder/assets/less/mediafinder.less
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/assets/less/mediafinder.less
rename to modules/backend/formwidgets/mediafinder/assets/less/mediafinder.less
diff --git a/modules/cms/formwidgets/mediafinder/partials/_file_single.htm b/modules/backend/formwidgets/mediafinder/partials/_file_single.htm
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/partials/_file_single.htm
rename to modules/backend/formwidgets/mediafinder/partials/_file_single.htm
diff --git a/modules/cms/formwidgets/mediafinder/partials/_image_single.htm b/modules/backend/formwidgets/mediafinder/partials/_image_single.htm
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/partials/_image_single.htm
rename to modules/backend/formwidgets/mediafinder/partials/_image_single.htm
diff --git a/modules/cms/formwidgets/mediafinder/partials/_mediafinder.htm b/modules/backend/formwidgets/mediafinder/partials/_mediafinder.htm
similarity index 100%
rename from modules/cms/formwidgets/mediafinder/partials/_mediafinder.htm
rename to modules/backend/formwidgets/mediafinder/partials/_mediafinder.htm
diff --git a/modules/cms/formwidgets/MediaFinder.php b/modules/cms/formwidgets/MediaFinder.php
index 778fb57b6..5d1d73aae 100644
--- a/modules/cms/formwidgets/MediaFinder.php
+++ b/modules/cms/formwidgets/MediaFinder.php
@@ -1,10 +1,6 @@
 <?php namespace Cms\FormWidgets;
 
-use Lang;
-use ApplicationException;
-use Cms\Classes\MediaLibrary;
-use Backend\Classes\FormField;
-use Backend\Classes\FormWidgetBase;
+use Backend\FormWidgets\MediaFinder as BackendMediaFinder;
 
 /**
  * Media Finder
@@ -17,102 +13,20 @@ use Backend\Classes\FormWidgetBase;
  *
  * @package october\cms
  * @author Alexey Bobkov, Samuel Georges
+ * @deprecated Use Backend\FormWidgets\MediaFinder. Remove if year >= 2020.
  */
-class MediaFinder extends FormWidgetBase
+class MediaFinder extends BackendMediaFinder
 {
-    //
-    // Configurable properties
-    //
-
     /**
-     * @var string Prompt to display if no record is selected.
+     * Constructor.
      */
-    public $prompt = 'cms::lang.mediafinder.default_prompt';
-
-    /**
-     * @var string Display mode for the selection. Values: file, image.
-     */
-    public $mode = 'file';
-
-    /**
-     * @var int Preview image width
-     */
-    public $imageWidth = null;
-
-    /**
-     * @var int Preview image height
-     */
-    public $imageHeight = null;
-
-    //
-    // Object properties
-    //
-
-    /**
-     * @inheritDoc
-     */
-    protected $defaultAlias = 'media';
-
-    /**
-     * @inheritDoc
-     */
-    public function init()
+    public function __construct()
     {
-        $this->fillFromConfig([
-            'mode',
-            'prompt',
-            'imageWidth',
-            'imageHeight'
-        ]);
+        traceLog('FormWidget Cms\FormWidgets\MediaFinder has been deprecated, use Backend\FormWidgets\MediaFinder instead.');
 
-        if ($this->formField->disabled) {
-            $this->previewMode = true;
-        }
-    }
+        $this->assetPath = '/modules/backend/formwidgets/mediafinder/assets';
+        $this->viewPath = base_path('/modules/backend/formwidgets/mediafinder/partials')
 
-    /**
-     * @inheritDoc
-     */
-    public function render()
-    {
-        $this->prepareVars();
-
-        return $this->makePartial('mediafinder');
-    }
-
-    /**
-     * Prepares the list data
-     */
-    public function prepareVars()
-    {
-        $value = $this->getLoadValue();
-        $this->vars['value'] = $value;
-        $this->vars['imageUrl'] = $value ? MediaLibrary::url($value) : '';
-        $this->vars['field'] = $this->formField;
-        $this->vars['prompt'] = str_replace('%s', '<i class="icon-folder"></i>', trans($this->prompt));
-        $this->vars['mode'] = $this->mode;
-        $this->vars['imageWidth'] = $this->imageWidth;
-        $this->vars['imageHeight'] = $this->imageHeight;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getSaveValue($value)
-    {
-        if ($this->formField->disabled || $this->formField->hidden) {
-            return FormField::NO_SAVE_DATA;
-        }
-
-        return $value;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function loadAssets()
-    {
-        $this->addJs('js/mediafinder.js', 'core');
-        $this->addCss('css/mediafinder.css', 'core');
+        parent::__construct(...func_get_args());
     }
 }