diff --git a/modules/Cockpit/assets/cockpit.js b/modules/Cockpit/assets/cockpit.js
index 4b84983c6..e9520d2bb 100755
--- a/modules/Cockpit/assets/cockpit.js
+++ b/modules/Cockpit/assets/cockpit.js
@@ -100,13 +100,14 @@
             select: function(callback, options){
 
                 options  = App.$.extend({
+                    pattern: "*.*",
                     selected : []
                 }, options);
 
                 var selected = [], dialog = UIkit.modal.dialog([
                     '<div>',
                         '<div class="uk-modal-header uk-text-large">'+App.i18n.get('Select asset')+'</div>',
-                        '<cp-assets path="'+(options.path || '')+'" typefilter="'+(options.typefilter || '')+'" modal="true"></cp-assets>',
+                        '<cp-assets pattern="' + (options.pattern || '*.*') + '" path="'+(options.path || '')+'" typefilter="'+(options.typefilter || '')+'" modal="true"></cp-assets>',
                         '<div class="uk-modal-footer uk-text-right">',
                             '<button class="uk-button uk-button-primary uk-margin-right uk-button-large uk-hidden js-select-button">'+App.i18n.get('Select')+': <span></span> item(s)</button>',
                             '<a class="uk-button uk-button-large uk-button-link uk-modal-close">'+App.i18n.get('Close')+'</a>',
diff --git a/modules/Cockpit/assets/components.js b/modules/Cockpit/assets/components.js
index 443d293b9..7780b9d8f 100755
--- a/modules/Cockpit/assets/components.js
+++ b/modules/Cockpit/assets/components.js
@@ -125,10 +125,11 @@ riot.tag2('cp-assets', '<div ref="list" show="{mode==\'list\'}"> <div ref="uploa
         this.page     = 1;
         this.pages    = 1;
         this.limit    = opts.limit || 15;
+        this.pattern    = opts.pattern || '*.*'
 
         this.on('mount', function() {
 
-            this.listAssets(1);
+            this.updateFilter();
 
             App.assets.require(['/assets/lib/uikit/js/components/upload.js'], function() {
 
@@ -136,6 +137,7 @@ riot.tag2('cp-assets', '<div ref="list" show="{mode==\'list\'}"> <div ref="uploa
 
                     action: App.route('/assetsmanager/upload'),
                     type: 'json',
+                    allow: $this.pattern,
                     before: function(options) {
                         options.params.folder = $this.folder
                     },
@@ -176,7 +178,8 @@ riot.tag2('cp-assets', '<div ref="list" show="{mode==\'list\'}"> <div ref="uploa
                             App.ui.notify("Something went wrong.", "danger");
                         }
 
-                    }
+                    },
+
                 },
 
                 uploadselect = UIkit.uploadSelect(App.$('.js-upload-select', $this.root)[0], uploadSettings),
@@ -232,10 +235,14 @@ riot.tag2('cp-assets', '<div ref="list" show="{mode==\'list\'}"> <div ref="uploa
 
             this.filter = null;
 
-            if (this.refs.filtertitle.value || this.refs.filtertype.value) {
+            if (this.refs.filtertitle.value || this.refs.filtertype.value || this.pattern !== '*.*') {
                 this.filter = {};
             }
 
+            if (this.pattern !== '*.*') {
+                this.filter.path = {'$regex': '^.*\.(' + this.pattern.replace(/\*./g, '') + ')$', '$options': 'i'};
+            }
+
             if (this.refs.filtertitle.value) {
 
                 this.filter.$or = [];
@@ -1856,6 +1863,7 @@ riot.tag2('field-asset', '<div ref="uploadprogress" class="uk-margin uk-hidden">
         }.bind(this);
 
         this.on('mount', function() {
+            $this.pattern = opts.pattern || '*.*';
 
             App.assets.require(['/assets/lib/uikit/js/components/upload.js'], function() {
 
@@ -1904,7 +1912,7 @@ riot.tag2('field-asset', '<div ref="uploadprogress" class="uk-margin uk-hidden">
                 if (Array.isArray(assets)) {
                     $this.$setValue(assets[0]);
                 }
-            });
+            }, { pattern: $this.pattern });
         }.bind(this)
 
         this.reset = function() {
diff --git a/modules/Cockpit/assets/components/cp-assets.tag b/modules/Cockpit/assets/components/cp-assets.tag
index c113cfc00..1bb043b46 100755
--- a/modules/Cockpit/assets/components/cp-assets.tag
+++ b/modules/Cockpit/assets/components/cp-assets.tag
@@ -272,10 +272,11 @@
         this.page     = 1;
         this.pages    = 1;
         this.limit    = opts.limit || 15;
+        this.pattern    = opts.pattern || '*.*'
 
         this.on('mount', function() {
 
-            this.listAssets(1);
+            this.updateFilter();
 
             // handle uploads
             App.assets.require(['/assets/lib/uikit/js/components/upload.js'], function() {
@@ -284,6 +285,7 @@
 
                     action: App.route('/assetsmanager/upload'),
                     type: 'json',
+                    allow: $this.pattern,
                     before: function(options) {
                         options.params.folder = $this.folder
                     },
@@ -324,7 +326,8 @@
                             App.ui.notify("Something went wrong.", "danger");
                         }
 
-                    }
+                    },
+                    
                 },
 
                 uploadselect = UIkit.uploadSelect(App.$('.js-upload-select', $this.root)[0], uploadSettings),
@@ -380,10 +383,14 @@
 
             this.filter = null;
 
-            if (this.refs.filtertitle.value || this.refs.filtertype.value) {
+            if (this.refs.filtertitle.value || this.refs.filtertype.value || this.pattern !== '*.*') {
                 this.filter = {};
             }
 
+            if (this.pattern !== '*.*') {
+                this.filter.path = {'$regex': '^.*\.(' + this.pattern.replace(/\*./g, '') + ')$', '$options': 'i'};
+            }
+
             if (this.refs.filtertitle.value) {
 
                 this.filter.$or = [];
diff --git a/modules/Cockpit/assets/components/field-asset.tag b/modules/Cockpit/assets/components/field-asset.tag
index deefd0856..e86f3c7f8 100644
--- a/modules/Cockpit/assets/components/field-asset.tag
+++ b/modules/Cockpit/assets/components/field-asset.tag
@@ -79,6 +79,7 @@
         }.bind(this);
 
         this.on('mount', function() {
+            $this.pattern = opts.pattern || '*.*';
 
             // handle uploads
             App.assets.require(['/assets/lib/uikit/js/components/upload.js'], function() {
@@ -128,7 +129,7 @@
                 if (Array.isArray(assets)) {
                     $this.$setValue(assets[0]);
                 }
-            });
+            }, { pattern: $this.pattern });
         }
 
         reset() {