diff --git a/src/highlighting.c b/src/highlighting.c
index 08bad241..89d8ebce 100644
--- a/src/highlighting.c
+++ b/src/highlighting.c
@@ -349,7 +349,7 @@ static void styleset_c_init(void)
 	// load global tags file for C autocompletion
 	if (! app->ignore_global_tags && ! global_c_tags_loaded)
 	{
-		tm_workspace_load_global_tags(GEANY_DATA_DIR "/global.tags");
+		tm_workspace_load_global_tags(GEANY_DATA_DIR G_DIR_SEPARATOR_S "global.tags");
 		global_c_tags_loaded = TRUE;
 	}
 }
@@ -479,7 +479,7 @@ static void styleset_cpp_init(void)
 	// load global tags file for C autocompletion
 	if (! app->ignore_global_tags && ! global_c_tags_loaded)
 	{
-		tm_workspace_load_global_tags(GEANY_DATA_DIR "/global.tags");
+		tm_workspace_load_global_tags(GEANY_DATA_DIR G_DIR_SEPARATOR_S "global.tags");
 		global_c_tags_loaded = TRUE;
 	}
 }
diff --git a/src/utils.c b/src/utils.c
index 45ce6fc8..47ce35f2 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1257,10 +1257,13 @@ void utils_build_show_hide(gint idx)
 	if (idx == -1 || doc_list[idx].file_type == NULL)
 	{
 		gtk_widget_set_sensitive(lookup_widget(app->window, "menu_build1"), FALSE);
+		gtk_menu_item_remove_submenu(GTK_MENU_ITEM(lookup_widget(app->window, "menu_build1")));
 		gtk_widget_set_sensitive(app->compile_button, FALSE);
 		gtk_widget_set_sensitive(app->run_button, FALSE);
 		return;
 	}
+	else
+		gtk_widget_set_sensitive(lookup_widget(app->window, "menu_build1"), TRUE);
 
 	ft = doc_list[idx].file_type;