diff --git a/Admin/GalleryAdmin.php b/Admin/GalleryAdmin.php
index a2bd68144..90657449a 100644
--- a/Admin/GalleryAdmin.php
+++ b/Admin/GalleryAdmin.php
@@ -110,7 +110,9 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper)
         $datagridMapper
             ->add('name')
             ->add('enabled')
-            ->add('context')
+            ->add('context', null, array(
+                'show_filter' => false,
+            ))
         ;
     }
 
diff --git a/Resources/views/GalleryAdmin/list.html.twig b/Resources/views/GalleryAdmin/list.html.twig
index 0a6b3f0a7..a9552155d 100644
--- a/Resources/views/GalleryAdmin/list.html.twig
+++ b/Resources/views/GalleryAdmin/list.html.twig
@@ -12,16 +12,30 @@ file that was distributed with this source code.
 {% extends 'SonataAdminBundle:CRUD:base_list.html.twig' %}
 
 {% block preview %}
-
-    <ul class="nav nav-pills">
-        <li><a><strong>{{ "label.select_context"|trans({}, 'SonataMediaBundle') }}</strong></a></li>
-        {% for name, context in media_pool.contexts %}
-            {% if name == persistent_parameters.context %}
-                <li class="active"><a href="{{ admin.generateUrl('list', {'context' : name }) }}">{{ name|trans({}, 'SonataMediaBundle') }}</a></li>
-            {% else %}
-                <li><a href="{{ admin.generateUrl('list', {'context' : name }) }}">{{ name|trans({}, 'SonataMediaBundle') }}</a></li>
-            {% endif %}
-        {% endfor %}
-    </ul>
-
+    <div class="box box-primary">
+        <div class="box-header">
+            <h1 class="box-title">
+                {{ "label.select_context"|trans({}, 'SonataMediaBundle') }}
+                <div class="btn-group">
+                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                        <strong class="text-info">{{ persistent_parameters.context }}</strong> <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu" role="menu">
+                        {% for name, context in media_pool.contexts %}
+                            <li>
+                                <a href="{{ admin.generateUrl('list', {'context' : name }) }}">
+                                    {% if name == persistent_parameters.context %}
+                                        <span class="pull-right">
+                                            <i class="fa fa-check"></i>
+                                        </span>
+                                    {% endif %}
+                                    {{ name|trans({}, 'SonataMediaBundle') }}
+                                </a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </h1>
+        </div>
+    </div>
 {% endblock %}