diff --git a/importxls.cgi b/importxls.cgi
index 5b4ccf91e..50986ef5a 100755
--- a/importxls.cgi
+++ b/importxls.cgi
@@ -116,7 +116,7 @@ sub guess_field_name
     for (my $i = 0; $i < @$guess_field_descs; $i+=2)
     {
         ($k, $v) = ($guess_field_descs->[$i], $guess_field_descs->[$i+1]);
-        ($r = $k), last if $name =~ /\Q$v\E/is;
+        ($r = $k), last if $name =~ /\Q$v\E/is || $name eq $k;
     }
     return $r;
 }
diff --git a/template/en/custom/bug/import/importxls.html.tmpl b/template/en/custom/bug/import/importxls.html.tmpl
index a7377e438..0c4d5817f 100644
--- a/template/en/custom/bug/import/importxls.html.tmpl
+++ b/template/en/custom/bug/import/importxls.html.tmpl
@@ -126,13 +126,21 @@ function fieldrename(field)
     <td><input type="checkbox" onclick="toggleallbugz(this.checked)" /></td>
 [% FOR field = fields %]
     <td style="white-space: nowrap">
-        [% IF NOT name_tr.${field} %]
-        <p id="tp_[% field | html %]"><a href="javascript:void fieldrename('[% field.replace("['\"]", '\\$&') | html %]')">[% IF import_field_descs.${field} %][% import_field_descs.${field} | html %][% ELSE %]<span style="color: red">[% field | html %]</span>[% END %]</a></p>
+        [% IF name_tr.${field} %]
+        <p id="tp_[% field | html %]">
+            <a href="javascript:void fieldrename('[% field.replace("['\"]", '\\$&') | html %]')">
+            [% IF import_field_descs.${field} %]
+                [% import_field_descs.${field} | html %]
+            [% ELSE %]
+                <span style="color: red">[% field | html %]</span>
+            [% END %]
+            </a>
+        </p>
         [% END %]
-        <select id="t_[% field | html %]" name="t_[% field | html %]" style="[% IF NOT name_tr.${field} %]display:none; [% END %]width: 90px">
+        <select id="t_[% field | html %]" name="t_[% field | html %]" style="[% IF name_tr.${field} %]display: none; width: 90px[% ELSE %]width: 150px[% END %]">
             <option value="">Don&apos;t map: [% field | html %]</option>
         [% FOR f = import_field_descs.keys.sort %]
-            <option value="[% f | html %]" [% IF name_tr.${field} == f OR import_field_descs.${field} == f %] selected[% END %]>[% import_field_descs.${f} | html %]</option>
+            <option value="[% f | html %]" [% IF name_tr.${field} == f %] selected[% SET found = 1 %][% END %]>[% import_field_descs.${f} | html %]</option>
         [% END %]
         </select>
     </td>