diff --git a/app/widgets/gimpcontainereditor.c b/app/widgets/gimpcontainereditor.c
index c2c2f4c26c..1a7b5bb580 100644
--- a/app/widgets/gimpcontainereditor.c
+++ b/app/widgets/gimpcontainereditor.c
@@ -448,7 +448,8 @@ gimp_container_editor_select_items (GimpContainerView   *view,
   if (klass->select_item)
     klass->select_item (editor, viewable);
 
-  if (editor->priv->container)
+  if (editor->priv->container &&
+      editor->priv->view_type == GIMP_VIEW_TYPE_GRID)
     {
       const gchar *signal_name;
       GType        children_type;
diff --git a/app/widgets/gimpcontainerview.c b/app/widgets/gimpcontainerview.c
index a3f200cc21..fc22d9d154 100644
--- a/app/widgets/gimpcontainerview.c
+++ b/app/widgets/gimpcontainerview.c
@@ -680,9 +680,8 @@ gimp_container_view_multi_selected (GimpContainerView *view,
 
   g_return_val_if_fail (GIMP_IS_CONTAINER_VIEW (view), FALSE);
 
-  if (! gimp_container_view_are_selected_items (view, items))
-    g_signal_emit (view, view_signals[SELECT_ITEMS], 0,
-                   items, items_data, &success);
+  g_signal_emit (view, view_signals[SELECT_ITEMS], 0,
+                 items, items_data, &success);
 
   return success;
 }