diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index 8f3cb60..403dc52 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -330,9 +330,7 @@ class CmsController < MyProfileController
   end
 
   def published_media_items
-    parent = profile.articles.find(params[:parent_id])
-    load_recent_files(parent)
-    @published_media_items_id = params[:parent_id]
+    load_recent_files(params[:parent_id], params[:q])
     render :partial => 'published_media_items'
   end
 
@@ -432,23 +430,32 @@ class CmsController < MyProfileController
     {:images => _('Images'), :generics => _('Files')}
   end
 
-  def load_recent_files(parent = nil)
+  def load_recent_files(parent_id = nil, q = nil)
     #TODO Since we only have special support for images, I'm limiting myself to
     #     consider generic files as non-images. In the future, with more supported
     #     file types we'll need to have a smart way to fetch from the database
     #     scopes of each supported type as well as the non-supported types as a
     #     whole.
     @recent_files = {}
+
+    parent = parent_id.present? ? profile.articles.find(parent_id) : nil
     if parent.present?
      files = parent.children.files
-     @published_media_items_id = parent.id
     else
       files = profile.files
-      @published_media_items_id = 'recent-media'
     end
+
     files = files.more_recent
-    @recent_files[:images] = files.images.limit(6)
-    @recent_files[:generics] = files.no_images.limit(6)
+    images = files.images.limit(6)
+    generics = files.no_images.limit(6)
+
+    if q.present?
+      @recent_files[:images] = find_by_contents(:images, images, q)[:results]
+      @recent_files[:generics] = find_by_contents(:generics, generics, q)[:results]
+    else
+      @recent_files[:images] = images
+      @recent_files[:generics] = generics
+    end
   end
 
 end
diff --git a/app/views/cms/_published_media_items.html.erb b/app/views/cms/_published_media_items.html.erb
index abddc44..7a32ac3 100644
--- a/app/views/cms/_published_media_items.html.erb
+++ b/app/views/cms/_published_media_items.html.erb
@@ -1,4 +1,4 @@
-<div id='<%= @published_media_items_id %>' class='items'>
+<div class='items'>
   <% file_types.each do |key, header| %>
     <% display = @recent_files[key].present? ? '' : 'none' %>
     <div class='<%= key.to_s %>' style='display: <%= display%>;'>
diff --git a/app/views/cms/_text_editor_sidebar.html.erb b/app/views/cms/_text_editor_sidebar.html.erb
index ff65ab9..02f1864 100644
--- a/app/views/cms/_text_editor_sidebar.html.erb
+++ b/app/views/cms/_text_editor_sidebar.html.erb
@@ -1,8 +1,4 @@
 <div class='text-editor-sidebar'>
-  <span class='button-add' data-value='<%= _('Add to the text') %>'></span>
-  <span class='button-zoom' data-value='<%= _('Zoom in') %>'></span>
-  <span class='button-close' data-value='<%= _('Close') %>'></span>
-
   <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
   <div class='text-editor-sidebar-box' id='media-upload-box'>
     <div class='header'><strong><%= _('Insert media') %></strong></div>
@@ -21,30 +17,14 @@
     </div>
   </div>
 
-  <div id='published-media' class='text-editor-sidebar-box'>
+  <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'>
     <div class='header'><strong><%= _('Published media') %></strong></div>
-    <%= select_profile_folder(nil, :parent_id, profile, 'recent-media', {'data-url' => url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier})}, {},
+    <%= select_profile_folder(nil, :parent_id, profile, 'recent-media', {}, {},
         "type='Folder' or type='Gallery'", {:root_label => _('Recent media')}) %>
+    <%= labelled_form_field _('Search'), text_field_tag('q') %>
     <%= render :partial => 'drag_and_drop_note' %>
     <%= render :partial => 'published_media_items' %>
   </div>
-
-  <div id='media-search-box' class='text-editor-sidebar-box'>
-    <div class='header'><strong><%= _('Media search') %></strong></div>
-    <p>
-    <%= form_tag({ :action => 'search' }) do %>
-      <span class='formfield'>
-        <input name='q' type='text' id='media-search-query' style='width: 250px;'/>
-      </span>
-      <%= submit_button :search, _('Search'), :id => 'media-search-button' %>
-    <% end %>
-    </p>
-    <div id='media-search-results' style='display: none'>
-      <%= render :partial => 'drag_and_drop_note' %>
-      <div class='items'>
-      </div>
-    </div>
-  </div>
 </div>
 
 <script id="template-upload" type="text/x-tmpl">
diff --git a/public/javascripts/media-panel.js b/public/javascripts/media-panel.js
index 79939de..100e40f 100644
--- a/public/javascripts/media-panel.js
+++ b/public/javascripts/media-panel.js
@@ -13,31 +13,34 @@ jQuery('#file').fileupload({
   }
 });
 
-jQuery('#published-media #parent_id').change(function(){
-  value = jQuery(this).val();
-  if(value == '')
-    value = 'recent-media'
-  selector = '#published-media #'+value
+function loadPublishedMedia() {
+  var parent_id = jQuery('#published-media #parent_id').val();
+  var q = jQuery('#published-media #q').val();
+  var url = jQuery('#published-media').data('url');
 
-  if (jQuery(selector).length > 0){
-    jQuery('#published-media .items').hide();
-    jQuery(selector).show();
-  } else {
-    jQuery('#published-media').addClass('fetching');
-    url = jQuery(this).data('url');
-    jQuery.ajax({
-      url: url,
-      data: {"parent_id":value},
-      dataType: 'html',
-      success: function(response) {
-        jQuery('#published-media .items').hide();
-        jQuery("#published-media").append('<div id="'+ value +'" class="items">' + response + '</div>');
-        jQuery('#published-media').removeClass('fetching');
-      },
-      error: function(response, textStatus, xhr) {
-        console.log(response);
-        console.log(textStatus);
-      }
-    });
-  }
+  jQuery('#published-media').addClass('fetching');
+  jQuery.ajax({
+    url: url,
+    data: {'parent_id': parent_id, 'q': q},
+    dataType: 'html',
+    success: function(response) {
+      jQuery("#published-media .items").html(response);
+      jQuery('#published-media').removeClass('fetching');
+    },
+    error: function(response, textStatus, xhr) {
+      console.log(response);
+      console.log(textStatus);
+    }
+  });
+}
+
+jQuery('#published-media #parent_id').change(function(){ loadPublishedMedia() });
+
+jQuery("#published-media #q").typeWatch({
+  callback: function (value) { loadPublishedMedia() },
+  wait: 750,
+  highlight: true,
+  captureLength: 2
 });
+
+jQuery("#published-media #q").bind('notext', function(){ loadPublishedMedia() });
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c09fedb..850efb5 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -3448,6 +3448,11 @@ div.with_media_panel .formfield input[type="checkbox"] {
   margin-bottom: 12px;
 }
 
+.text-editor-sidebar select,
+.text-editor-sidebar input {
+  width: 100%;
+}
+
 .text-editor-sidebar .items .image {
 	display: inline-block;
 	vertical-align: middle;
--
libgit2 0.21.2