diff --git a/src/dialogs/aniedit.cpp b/src/dialogs/aniedit.cpp
index 617aed8d1..d14e288e1 100644
--- a/src/dialogs/aniedit.cpp
+++ b/src/dialogs/aniedit.cpp
@@ -691,7 +691,7 @@ static bool anieditor_msg_proc(JWidget widget, JMessage msg)
       /* close animation editor */
       if ((command && (strcmp(command->short_name(), CommandId::FilmEditor) == 0)) ||
 	  (msg->key.scancode == KEY_ESC)) {
-	jwidget_close_window(widget);
+	widget->closeWindow();
 	return true;
       }
 
diff --git a/src/dialogs/filesel.cpp b/src/dialogs/filesel.cpp
index cf33ff75e..c39d48621 100644
--- a/src/dialogs/filesel.cpp
+++ b/src/dialogs/filesel.cpp
@@ -577,7 +577,7 @@ static bool fileview_msg_proc(JWidget widget, JMessage msg)
 
 	/* when a file is accepted */
       case SIGNAL_FILEVIEW_FILE_ACCEPT:
-	jwidget_close_window(widget);
+	widget->closeWindow();
 	break;
 
 	/* when the current folder change */
diff --git a/src/dialogs/repo.cpp b/src/dialogs/repo.cpp
index 1f3547b17..f04efff1b 100644
--- a/src/dialogs/repo.cpp
+++ b/src/dialogs/repo.cpp
@@ -170,7 +170,7 @@ static bool repo_listbox_msg_proc(JWidget widget, JMessage msg)
 	case JI_SIGNAL_LISTBOX_SELECT:
 	  if (repo_dlg->use_listitem)
 	    if (!(*repo_dlg->use_listitem)(repo_dlg))
-	      jwidget_close_window(widget);
+	      widget->closeWindow();
 	  break;
       }
       break;
@@ -183,7 +183,7 @@ static void use_command(Button* widget, RepoDlg* repo_dlg)
 {
   if (repo_dlg->use_listitem) {
     if (!(*repo_dlg->use_listitem)(repo_dlg))
-      jwidget_close_window(widget);
+      widget->closeWindow();
   }
 }
 
@@ -205,7 +205,7 @@ static void add_command(Button* widget, RepoDlg* repo_dlg)
     }
 
     if (!ret)
-      jwidget_close_window(widget);
+      widget->closeWindow();
   }
 }
 
@@ -246,6 +246,6 @@ static void delete_command(Button* widget, RepoDlg* repo_dlg)
     }
 
     if (!ret)
-      jwidget_close_window(widget);
+      widget->closeWindow();
   }
 }
diff --git a/src/gui/widget.cpp b/src/gui/widget.cpp
index d7f580cf7..3746280c5 100644
--- a/src/gui/widget.cpp
+++ b/src/gui/widget.cpp
@@ -1224,9 +1224,6 @@ bool jwidget_emit_signal(JWidget widget, int signal_num)
 /**********************************************************************/
 /* manager handler */
 
-void jwidget_close_window(JWidget widget)
-{ widget->closeWindow(); }
-
 bool Widget::sendMessage(JMessage msg)
 {
   bool done = false;
diff --git a/src/gui/widget.h b/src/gui/widget.h
index 9f87cc443..0c893d560 100644
--- a/src/gui/widget.h
+++ b/src/gui/widget.h
@@ -95,10 +95,6 @@ void jwidget_signal_off(JWidget widget);
 
 bool jwidget_emit_signal(JWidget widget, int signal_num);
 
-/* manager handler */
-
-void jwidget_close_window(JWidget widget);
-
 /* miscellaneous */
 
 JWidget jwidget_find_name(JWidget widget, const char *name);
diff --git a/src/skin_theme.cpp b/src/skin_theme.cpp
index 317a90e46..cfc53d600 100644
--- a/src/skin_theme.cpp
+++ b/src/skin_theme.cpp
@@ -1741,7 +1741,7 @@ bool SkinTheme::theme_frame_button_msg_proc(JWidget widget, JMessage msg)
       if (msg->key.scancode == KEY_ESC) {
 	if (widget->isSelected()) {
 	  widget->setSelected(false);
-	  jwidget_close_window(widget);
+	  widget->closeWindow();
 	  return true;
 	}
       }