diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 7d00783..aa8c94f 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -448,9 +448,14 @@ static GtkWidget * trace_window = NULL;
  LIB3270_EXPORT GtkWidget * pw3270_get_terminal_widget(GtkWidget *widget)
  {
  	if(!widget)
-		widget = pw3270_get_toplevel();
+	{
+		// No widget, get the default one
+		return v3270_get_default_widget();
+	}
+
  	g_return_val_if_fail(GTK_IS_PW3270(widget),NULL);
  	return GTK_PW3270(widget)->terminal;
+
  }
 
  static void setup_input_method(GtkWidget *widget, GtkWidget *obj)
--
libgit2 0.21.2