diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageDisplay.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageDisplay.java
index fb97a4eba..354430ad3 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/ImageDisplay.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageDisplay.java
@@ -24,12 +24,10 @@ import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ImageAsset;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.Service;
-// import com.arsdigita.cms.dispatcher.Utilities;
 import com.arsdigita.mimetypes.MimeType;
 import com.arsdigita.util.Assert;
 import com.arsdigita.web.URL;
 import com.arsdigita.xml.Element;
-
 import java.math.BigDecimal;
 
 
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImagesPane.java b/ccm-cms/src/com/arsdigita/cms/ui/ImagesPane.java
index e80ded727..b5660d0e6 100644
--- a/ccm-cms/src/com/arsdigita/cms/ui/ImagesPane.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ImagesPane.java
@@ -84,7 +84,6 @@ public class ImagesPane extends LayoutPanel implements Resettable {
         final ImageLibraryComponent library = new ImageLibraryComponent(ImageComponent.ADMIN_IMAGES);
         library.getForm().addInitListener(m_adminListener);
         library.getForm().addProcessListener(m_adminListener);
-//        library.addUploadLink(m_adminListener);
         selectors.put(ImageComponent.LIBRARY, library);
         m_bodySegments.put(ImageComponent.LIBRARY, m_body.addSegment(
                 new Label(GlobalizationUtil.globalize("cms.ui.image_library")),
@@ -132,6 +131,7 @@ public class ImagesPane extends LayoutPanel implements Resettable {
     public final void setActiveImageComponent(PageState state, String activeComp) {
 
         Iterator<String> keys = m_bodySegments.keySet().iterator();
+        m_imageComponent.setSelectedKey(state, activeComp);
 
         while (keys.hasNext()) {