diff --git a/src/entry.c b/src/entry.c
index f4adb5a..d871812 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -123,8 +123,8 @@ zenity_entry (ZenityData *data, ZenityEntryData *entry_data) {
 
 	text = gtk_builder_get_object (builder, "zenity_entry_text");
 
-    if (entry_data->dialog_text)
-        gtk_label_set_markup (
+	if (entry_data->dialog_text)
+		gtk_label_set_markup (
 			GTK_LABEL (text), g_strcompress (entry_data->dialog_text));
 
 	vbox = gtk_builder_get_object (builder, "vbox4");
diff --git a/src/main.c b/src/main.c
index 401ede5..6d44250 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,15 +32,26 @@
 #include <locale.h>
 #endif
 
+static GLogWriterOutput
+zenity_suppress_log (GLogLevelFlags log_level, const GLogField *fields,
+	gsize n_fields, gpointer user_data) {
+	return G_LOG_WRITER_HANDLED;
+}
+
 gint
 main (gint argc, gchar **argv) {
 	ZenityParsingOptions *results;
 	gint retval;
+	const char *is_debug;
 
 #ifdef HAVE_LOCALE_H
 	setlocale (LC_ALL, "");
 #endif
 
+	is_debug = getenv ("ZENITY_DEBUG");
+	if (is_debug == NULL || strlen (is_debug) < 1)
+		g_log_set_writer_func (zenity_suppress_log, NULL, NULL);
+
 	gtk_init (&argc, &argv);
 
 	results = zenity_option_parse (argc, argv);
diff --git a/src/text.c b/src/text.c
index 7380181..9712b70 100644
--- a/src/text.c
+++ b/src/text.c
@@ -201,7 +201,7 @@ zenity_text (ZenityData *data, ZenityTextData *text_data) {
 	text_label = gtk_builder_get_object (builder, "zenity_text_label");
 
 	if (text_data->dialog_text)
-        gtk_label_set_markup (
+		gtk_label_set_markup (
 			GTK_LABEL (text_label), g_strcompress (text_data->dialog_text));
 
 	zenity_util_show_dialog (dialog);