diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c
index 2826ace5f1..3ebcd885a5 100644
--- a/src/bin/gnucash-bin.c
+++ b/src/bin/gnucash-bin.c
@@ -353,7 +353,7 @@ inner_main (void *closure, int argc, char **argv)
     /* TODO: After some more guile-extraction, this should happen even
        before booting guile.  */
     gnc_main_gui_init();
-    
+
     qof_log_set_level_global(loglevel);
 
     load_system_config();
@@ -420,6 +420,7 @@ int main(int argc, char ** argv)
     }
 
     gnc_gnome_init (argc, argv, VERSION);
+    gnc_gui_init();
     scm_boot_guile(argc, argv, inner_main, 0);
     exit(0); /* never reached */
 }
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index fbee0d1ce1..488ccbde75 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -40,6 +40,7 @@ libgncmod_gnome_utils_la_SOURCES = \
   dialog-preferences.c \
   dialog-query-list.c \
   dialog-reset-warnings.c \
+  dialog-totd.c \
   dialog-transfer.c \
   dialog-utils.c \
   druid-utils.c \
@@ -104,6 +105,7 @@ gncinclude_HEADERS = \
   dialog-options.h \
   dialog-query-list.h \
   dialog-reset-warnings.h \
+  dialog-totd.h \
   dialog-transfer.h \
   dialog-utils.h \
   druid-utils.h \
diff --git a/src/gnome/dialog-totd.c b/src/gnome-utils/dialog-totd.c
similarity index 100%
rename from src/gnome/dialog-totd.c
rename to src/gnome-utils/dialog-totd.c
diff --git a/src/gnome/dialog-totd.h b/src/gnome-utils/dialog-totd.h
similarity index 100%
rename from src/gnome/dialog-totd.h
rename to src/gnome-utils/dialog-totd.h
diff --git a/src/gnome-utils/gnc-gnome-utils.c b/src/gnome-utils/gnc-gnome-utils.c
index ad5602e5b6..99fd82567c 100644
--- a/src/gnome-utils/gnc-gnome-utils.c
+++ b/src/gnome-utils/gnc-gnome-utils.c
@@ -47,6 +47,7 @@
 #include "gnc-icons.h"
 #include "dialog-options.h"
 #include "dialog-commodity.h"
+#include "dialog-totd.h"
 #include "gnc-ui-util.h"
 #include <gnc-dir.h>
 
@@ -403,6 +404,7 @@ gnc_gui_init(void)
     g_free(map);
 
     gnc_load_stock_icons();
+    gnc_totd_dialog(GTK_WINDOW(main_window), TRUE);
 
     return main_window;
 }
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index 23d4f86206..ff4f5cf8ec 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -35,7 +35,6 @@ libgncgnome_la_SOURCES = \
   dialog-sx-from-trans.c \
   dialog-sxsincelast.c \
   dialog-tax-info.c \
-  dialog-totd.c \
   dialog-userpass.c \
   dialog-scheduledxaction.c \
   druid-acct-period.c \
@@ -98,7 +97,6 @@ noinst_HEADERS = \
   dialog-progress.h \
   dialog-sx-from-trans.h \
   dialog-sxsincelast.h \
-  dialog-totd.h \
   dialog-scheduledxaction.h \
   druid-acct-period.h \
   druid-hierarchy.h \
diff --git a/src/gnome/top-level.c b/src/gnome/top-level.c
index d2756f3da0..be29fe1050 100644
--- a/src/gnome/top-level.c
+++ b/src/gnome/top-level.c
@@ -198,10 +198,7 @@ gnc_html_price_url_cb (const char *location, const char *label,
 void
 gnc_main_gui_init (void)
 {
-    GncMainWindow *main_window;
-
     ENTER(" ");
-    main_window = gnc_gui_init();
 
     if (!gnucash_style_init())
       gnc_shutdown(1);
@@ -215,8 +212,6 @@ gnc_main_gui_init (void)
 
     gnc_ui_sx_initialize();
 
-    gnc_totd_dialog(GTK_WINDOW(main_window), TRUE);
-
     /* FIXME Remove this test code */
     gnc_plugin_manager_add_plugin (
         gnc_plugin_manager_get (), gnc_plugin_account_tree_new ());