diff --git a/source/rofi.c b/source/rofi.c
index 82bebc9e..8bc82d98 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -1376,6 +1376,7 @@ void error_dialog ( const char *msg, int markup )
         }
     }
     release_keyboard ( display );
+    menu_free_state ( &state );
 }
 
 /**
diff --git a/source/textbox.c b/source/textbox.c
index 6538d4bf..b94253ba 100644
--- a/source/textbox.c
+++ b/source/textbox.c
@@ -778,6 +778,7 @@ void textbox_cleanup ( void )
         }
 
         g_object_unref ( p_context );
+        pango_xft_shutdown_display ( display, DefaultScreen ( display ) );
         p_context       = NULL;
         visual_info     = NULL;
         target_colormap = None;