diff --git a/TODO b/TODO
index 2c73877..07299e0 100644
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@ This project is in heavy development, we are currenty working towards the
 
 Bugs to fix:
 
-* Tabs don't stay in sync with content view when re-opening a file
 * Icons are missing from toolbar and context menu
 * Remember position and size of window and panels
 
diff --git a/src/bin/edi_mainview.c b/src/bin/edi_mainview.c
index 16b7d3f..f75e338 100644
--- a/src/bin/edi_mainview.c
+++ b/src/bin/edi_mainview.c
@@ -23,7 +23,7 @@ _promote(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
    elm_naviframe_item_promote(data);
 }
 
-static Elm_Object_Item *
+static Edi_Mainview_Item *
 _get_item_for_path(const char *path)
 {
    Eina_List *list, *item;
@@ -32,21 +32,35 @@ _get_item_for_path(const char *path)
    list = elm_naviframe_items_get(nf);
    EINA_LIST_FOREACH(list, item, it)
      {
-        const char *loaded;
-        loaded = elm_object_item_data_get(it);
+        Edi_Mainview_Item *item;
+        item = elm_object_item_data_get(it);
 
-        if (loaded && !strcmp(loaded, path))
-          return it;
+        if (item && !strcmp(item->path, path))
+          return item;
      }
    return NULL;
 }
 
+static Edi_Mainview_Item *
+_edi_mainview_item_add(const char *path, Elm_Object_Item *tab, Evas_Object *view)
+{
+   Edi_Mainview_Item *item;
+
+   item = malloc(sizeof(Edi_Mainview_Item));
+   item->path = path;
+   item->tab = tab;
+   item->view = view;
+
+   return item;
+}
+
 static void
 _edi_mainview_open_file_text(const char *path)
 {
    Evas_Object *txt;
    Elm_Object_Item *it, *tab;
-        
+   Edi_Mainview_Item *item;
+
    txt = elm_entry_add(nf);
    elm_entry_scrollable_set(txt, EINA_TRUE);
    elm_entry_text_style_user_push(txt, "DEFAULT='font=Monospace font_size=12'");
@@ -57,10 +71,12 @@ _edi_mainview_open_file_text(const char *path)
    evas_object_show(txt);
 
    it = elm_naviframe_item_simple_push(nf, txt);
-   elm_object_item_data_set(it, path);
    elm_naviframe_item_style_set(it, "overlap");
    tab = elm_toolbar_item_append(tb, NULL, basename(path), _promote, it);
    elm_toolbar_item_selected_set(tab, EINA_TRUE);
+
+   item = _edi_mainview_item_add(path, tab, it);
+   elm_object_item_data_set(it, item);
 }
 
 static void
@@ -68,6 +84,7 @@ _edi_mainview_open_file_image(const char *path)
 {
    Evas_Object *img, *scroll;
    Elm_Object_Item *it, *tab;
+   Edi_Mainview_Item *item;
 
    scroll = elm_scroller_add(nf);
    evas_object_size_hint_weight_set(scroll, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -80,10 +97,12 @@ _edi_mainview_open_file_image(const char *path)
    evas_object_show(img);
 
    it = elm_naviframe_item_simple_push(nf, scroll);
-   elm_object_item_data_set(it, path);
    elm_naviframe_item_style_set(it, "overlap");
    tab = elm_toolbar_item_append(tb, NULL, basename(path), _promote, it);
    elm_toolbar_item_selected_set(tab, EINA_TRUE);
+
+   item = _edi_mainview_item_add(path, tab, it);
+   elm_object_item_data_set(it, item);
 }
 
 static void
@@ -111,12 +130,13 @@ _edi_mainview_open_stat_done(void *data, Eio_File *handler EINA_UNUSED, const Ei
 EAPI void
 edi_mainview_open_path(const char *path, const char *type)
 {
-   Elm_Object_Item *it;
+   Edi_Mainview_Item *it;
 
    it = _get_item_for_path(path);
    if (it)
      {
-        elm_naviframe_item_promote(it);
+        elm_naviframe_item_promote(it->view);
+        elm_toolbar_item_selected_set(it->tab, EINA_TRUE);
         return;
      }
 
@@ -155,6 +175,7 @@ edi_mainview_close()
 
    elm_naviframe_item_pop(nf);
    elm_object_item_del(elm_toolbar_selected_item_get(tb));
+   free(elm_object_item_data_get(elm_naviframe_top_item_get(nf)));
 }
 
 EAPI void
diff --git a/src/bin/edi_mainview.h b/src/bin/edi_mainview.h
index 9966631..e0d87a2 100644
--- a/src/bin/edi_mainview.h
+++ b/src/bin/edi_mainview.h
@@ -2,6 +2,7 @@
 # define EDI_MAINVIEW_H_
 
 #include <Elementary.h>
+#include <Evas.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,6 +13,28 @@ extern "C" {
  * @brief These routines are used for managing the main area of the Edi interface.
  */
  
+ /**
+ * @typedef Edi_Mainview_Item
+ * An item being displayed in the mainview.
+ */
+typedef struct _Edi_Mainview_Item Edi_Mainview_Item;
+
+/**
+ * @struct _Edi_Mainview_Item
+ * An item being displayed in the mainview.
+ */
+struct _Edi_Mainview_Item
+{
+   const char *path; /**< The path of the file in this mainview item */
+
+   Elm_Object_Item *tab; /**< The tab object connected to this view */
+   Elm_Object_Item *view; /**< The naviframe item that contains the view for this item */
+
+   /* Private */
+
+   /* Add new members here. */
+};
+
 /**
  * @brief UI management functions.
  * @defgroup UI