diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
index efac0ec51..fb42f3f82 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
@@ -61,6 +61,7 @@ public class FilesControlSet extends PopupControlSet {
     public void readFromTask(Task task) {
         super.readFromTask(task);
 
+        refreshMetadata();
         refreshDisplayView();
     }
 
@@ -97,6 +98,7 @@ public class FilesControlSet extends PopupControlSet {
     protected void afterInflate() {
         fileList = (LinearLayout) getView().findViewById(R.id.files_list);
         final LinearLayout finalList = fileList;
+        fileList.removeAllViews();
         for (final Metadata m : files) {
             final View fileRow = inflater.inflate(R.layout.file_row, null);
 
diff --git a/astrid/res/layout/control_set_files.xml b/astrid/res/layout/control_set_files.xml
index fd9a245f5..d7ca6a8b8 100644
--- a/astrid/res/layout/control_set_files.xml
+++ b/astrid/res/layout/control_set_files.xml
@@ -12,7 +12,7 @@
       android:layout_weight="100">
 	  <LinearLayout
 	    android:id="@+id/files_list"
-	    android:orientation="horizontal"
+	    android:orientation="vertical"
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
 	    android:gravity="right">