diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index 3c89a0dea..5884f5307 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,5 +1,10 @@
 2002-01-27  Bradford Hovinen  <hovinen@ximian.com>
 
+	* service-info.c (service_info_load_all): Always set run_program
+	to TRUE
+
+	* service-edit-dialog.c (fill_dialog): Disable look at content toggle
+
 	* mime-type-info.c (mime_category_info_load_all): Call
 	_get_mime_application
 
diff --git a/capplets/file-types/TODO_NOTES b/capplets/file-types/TODO_NOTES
index f45622515..4a442ce91 100644
--- a/capplets/file-types/TODO_NOTES
+++ b/capplets/file-types/TODO_NOTES
@@ -1,4 +1,4 @@
  - Add categories to many types in MIME database
- - Fix gnome_url_show
- - Need a way to get all apps in the app registry
  - Better sorting on the MIME types tree
+ - Disable look at content for now
+ - Edit MIME type directly with command line option
\ No newline at end of file
diff --git a/capplets/file-types/service-edit-dialog.c b/capplets/file-types/service-edit-dialog.c
index 00b929ba3..cbe02a4c9 100644
--- a/capplets/file-types/service-edit-dialog.c
+++ b/capplets/file-types/service-edit-dialog.c
@@ -326,8 +326,12 @@ fill_dialog (ServiceEditDialog *dialog)
 		gtk_widget_set_sensitive (WID ("protocol_entry"), FALSE);
 	}
 
+#if 0  /* Keep the look at content toggle disabled until we support that in libgnome */
 	if (gnome_vfs_method_get (dialog->p->info->protocol) == NULL)
 		gtk_widget_set_sensitive (WID ("look_at_content_toggle"), FALSE);
+#else
+		gtk_widget_set_sensitive (WID ("look_at_content_toggle"), FALSE);
+#endif
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("look_at_content_toggle")), !dialog->p->info->run_program);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("run_program_toggle")), dialog->p->info->run_program);
diff --git a/capplets/file-types/service-info.c b/capplets/file-types/service-info.c
index 4a796f1f2..dc4c1df25 100644
--- a/capplets/file-types/service-info.c
+++ b/capplets/file-types/service-info.c
@@ -113,7 +113,11 @@ service_info_load_all (ServiceInfo *info)
 
 	service_info_get_description (info);
 
+#if 0
 	info->run_program = get_bool (info, "type");
+#else
+	info->run_program = TRUE;
+#endif
 
 	if (info->custom_line == NULL)
 		info->custom_line = get_string (info, "command");