diff --git a/src/com/studentersamfundet/app/ui/ProgramListActivity.java b/src/com/studentersamfundet/app/ui/ProgramListActivity.java
index a658cea..166da94 100644
--- a/src/com/studentersamfundet/app/ui/ProgramListActivity.java
+++ b/src/com/studentersamfundet/app/ui/ProgramListActivity.java
@@ -40,6 +40,8 @@ public class ProgramListActivity extends BaseDnsActivity {
 	private XmlParser parser;
 	private DataHandler dataHandler;
 	
+	private String currentCategory = Event.ALL; 
+	
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -77,6 +79,16 @@ public class ProgramListActivity extends BaseDnsActivity {
         }
     }
     
+    @Override
+    public void onBackPressed() {
+    	if (currentCategory.equals(Event.ALL)) {
+    		super.onBackPressed();
+    	} else {
+    		ListCreator lc = new ListCreator(Event.ALL, false);
+    		lc.execute();
+    	}
+    }
+    
     
     protected ListAdapter createAdapter(String category) {
     	Event[] events = dataHandler.populateList(category);
@@ -225,6 +237,8 @@ public class ProgramListActivity extends BaseDnsActivity {
 		        
 		        ProgressBar pb = (ProgressBar)findViewById(R.id.event_list_progress_bar);
 		        pb.setVisibility(View.GONE);
+		        
+		        currentCategory = category;
 			} else {
 				Toast toast = Toast.makeText(ProgramListActivity.this, R.string.error_noconnection_noupdate, Toast.LENGTH_LONG);
 	        	toast.show();