diff --git a/ecrire/inc_mots.php3 b/ecrire/inc_mots.php3
index db8572305c20794489fc77e4e652a564cc36af22..406f8060eeaf9b7e224c193f08fc28b6621ac70e 100644
--- a/ecrire/inc_mots.php3
+++ b/ecrire/inc_mots.php3
@@ -653,7 +653,7 @@ function afficher_groupe_mots($id_groupe) {
 
 				if ($connect_statut == "0minirezo" OR $occurrences['articles'][$id_mot] > 0)
 				  $s = "<a href='" .
-				    generer_url_ecrire('mots_edit', "id_mot=$id_mot&redirect=" . generer_url_ecrire('mots_tous')) .
+				    generer_url_ecrire('mots_edit', "id_mot=$id_mot&redirect=" . urlencode(generer_url_ecrire('mots_tous'))) .
 				    "' class='liste-mot'>".typo($titre_mot)."</a>";
 				else
 					$s = typo($titre_mot);
diff --git a/ecrire/inc_mots_tous.php b/ecrire/inc_mots_tous.php
index 4736dabc190c5ee83176755b29fd56c7a62f1470..d72b7affe509e3acea4bfd811e9d27ed4660ceca 100644
--- a/ecrire/inc_mots_tous.php
+++ b/ecrire/inc_mots_tous.php
@@ -56,7 +56,7 @@ function mots_tous_dist()
 
 		// si le mot n'est pas lie, on demande sa suppression
 		if ($nb_articles + $nb_breves + $nb_sites + $nb_forum == 0) {
-		  redirige_par_entete(generer_url_ecrire("mots_edit"),"?supp_mot=$id_mot&redirect_ok=oui&redirect=" . generer_url_ecrire('mots_tous'));
+		  redirige_par_entete(generer_url_ecrire("mots_edit"),"?supp_mot=$id_mot&redirect_ok=oui&redirect=" . urlencode(generer_url_ecrire('mots_tous')));
 		} // else traite plus loin (confirmation de suppression)
 	}
 }
@@ -142,7 +142,7 @@ if ($conf_mot>0) {
 	echo _T('info_delet_mots_cles', array('titre_mot' => $titre_mot, 'type_mot' => $type_mot, 'texte_lie' => $texte_lie));
 
 	echo "<UL>";
-	echo "<LI><B><A href='", generer_url_ecrire('mots_edit', "supp_mot=$id_mot&redirect_ok=oui&redirect=" . generer_url_ecrire('mots_tous')),
+	echo "<LI><B><A href='", generer_url_ecrire('mots_edit', "supp_mot=$id_mot&redirect_ok=oui&redirect=" . urlencode(generer_url_ecrire('mots_tous'))),
 	  "'>",
 	  _T('item_oui'),
 	  "</A>,</B> ",
@@ -230,7 +230,7 @@ while ($row_groupes = spip_fetch_array($result_groupes)) {
 		}
 		echo "<td>";
 		echo "<div align='$spip_lang_right'>";
-		icone(_T('icone_creation_mots_cles'), generer_url_ecrire("mots_edit","new=oui&id_groupe=$id_groupe&redirect=" . generer_url_ecrire('mots_tous')), "mot-cle-24.gif", "creer.gif");
+		icone(_T('icone_creation_mots_cles'), generer_url_ecrire("mots_edit","new=oui&id_groupe=$id_groupe&redirect=" . urlencode(generer_url_ecrire('mots_tous'))), "mot-cle-24.gif", "creer.gif");
 		echo "</div>";
 		echo "</td></tr></table>";
 	}	
diff --git a/ecrire/inc_mots_type.php b/ecrire/inc_mots_type.php
index faf303cc538ddc12d915ff10a3b1a768a7ae7abb..2708762cc7893010c67e27d9415e0a7be58de83c 100644
--- a/ecrire/inc_mots_type.php
+++ b/ecrire/inc_mots_type.php
@@ -85,7 +85,7 @@ echo aide("motsgroupes");
 if ($connect_statut =="0minirezo"){
 	$type=entites_html(urldecode($type));
 	echo "<p><font face='Verdana,Arial,Sans,sans-serif'>";
-	echo generer_url_post_ecrire("mots_tous", "$id_groupe=$id_groupe");
+	echo generer_url_post_ecrire("mots_tous", "id_groupe=$id_groupe");
 	echo "<INPUT TYPE='Hidden' NAME='modifier_groupe' VALUE=\"oui\">\n";
 	echo "<INPUT TYPE='Hidden' NAME='ancien_type' VALUE=\"$ancien_type\">\n";
 	debut_cadre_formulaire();