diff --git a/source/rofi.c b/source/rofi.c
index 9f6f14db..ea155f2b 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -383,6 +383,11 @@ static void cleanup ()
         }
         g_list_free ( list_of_error_msgs );
     }
+
+    if ( rofi_theme ) {
+        rofi_theme_free ( rofi_theme );
+        rofi_theme = NULL;
+    }
     TIMINGS_STOP ();
 }
 
diff --git a/source/widgets/listview.c b/source/widgets/listview.c
index 7f657495..6e1e9bce 100644
--- a/source/widgets/listview.c
+++ b/source/widgets/listview.c
@@ -383,6 +383,7 @@ listview *listview_create ( const char *name, listview_update_callback cb, void
     textbox *tb      = textbox_create ( tb_name, 0, NORMAL, "" );
     lv->element_height = textbox_get_estimated_height ( tb, lv->eh );
     g_free ( tb_name );
+    widget_free ( WIDGET ( tb ) );
 
     lv->callback = cb;
     lv->udata    = udata;