diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 11630512e8f7d..13bf1e6cc6374 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -99,7 +99,7 @@ estack_pop() {
 	if [[ -n ${_estack_retvar} ]] ; then
 		eval ${_estack_retvar}=\"\${${_estack_name}\[${_estack_i}\]}\"
 	fi
-	eval unset ${_estack_name}\[${_estack_i}\]
+	eval unset \"${_estack_name}\[${_estack_i}\]\"
 }
 
 # @FUNCTION: evar_push