diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemRecentTasksList.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemRecentTasksList.java
index 83bfe5a2200f..e62f28a22b33 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemRecentTasksList.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemRecentTasksList.java
@@ -51,7 +51,7 @@ public class ExternalSystemRecentTasksList extends JBList implements Producer<Ex
                                        @NotNull final Project project)
   {
     super(model);
-    
+    setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     ExternalSystemManager<?, ?, ?, ?, ?> manager = ExternalSystemApiUtil.getManager(externalSystemId);
     Icon icon = null;
     if (manager instanceof ExternalSystemUiAware) {
@@ -127,6 +127,7 @@ public class ExternalSystemRecentTasksList extends JBList implements Producer<Ex
 
     @Override
     public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+      Component renderer = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
       if (value instanceof ExternalSystemRecentTaskListModel.MyEmptyDescriptor) {
         return EMPTY_RENDERER;
       }
@@ -147,7 +148,8 @@ public class ExternalSystemRecentTasksList extends JBList implements Producer<Ex
         }
         setIcon(icon);
       }
-      return this;
+      
+      return renderer;
     }
 
     @Override
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksPanel.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksPanel.java
index aa9c366bea7b..29643bbbd3ef 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksPanel.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ExternalSystemTasksPanel.java
@@ -80,6 +80,7 @@ public class ExternalSystemTasksPanel extends SimpleToolWindowPanel implements D
     AbstractExternalSystemLocalSettings settings = manager.getLocalSettingsProvider().fun(project);
 
     ExternalSystemRecentTaskListModel recentTasksModel = new ExternalSystemRecentTaskListModel();
+    recentTasksModel.setTasks(settings.getRecentTasks());
     myRecentTasksList = new ExternalSystemRecentTasksList(recentTasksModel, externalSystemId, project) {
       @Override
       protected void processMouseEvent(MouseEvent e) {
@@ -87,7 +88,6 @@ public class ExternalSystemTasksPanel extends SimpleToolWindowPanel implements D
         super.processMouseEvent(e);
       }
     };
-    recentTasksModel.setTasks(settings.getRecentTasks());
 
     myAllTasksModel = new ExternalSystemTasksTreeModel(externalSystemId);
     myAllTasksTree = new ExternalSystemTasksTree(myAllTasksModel, settings.getExpandStates()) {
@@ -119,10 +119,10 @@ public class ExternalSystemTasksPanel extends SimpleToolWindowPanel implements D
   }
 
   private static JComponent wrap(@NotNull JComponent content, @NotNull String title) {
-    JPanel result = new JPanel(new GridBagLayout());
+    JPanel result = new JPanel(new BorderLayout());
     result.setOpaque(false);
     result.setBorder(IdeBorderFactory.createTitledBorder(title));
-    result.add(content, ExternalSystemUiUtil.getFillLineConstraints(0).weighty(1).fillCell());
+    result.add(content, BorderLayout.CENTER);
     return result;
   }