diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 82dfcb46..e3d97a16 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -25,8 +25,8 @@ class TagEditTheme extends Themelet {
 			<tr>
 				<td width='50px'>Tags</td>
 				<td width='300px'>
-					<span class='view'>$h_tags</span>
-					<input class='edit' type='text' name='tag_edit__tags' value='$h_tags' class='autocomplete_tags' id='tag_editor'>
+					<!--<span class='view'>$h_tags</span>-->
+					<input type='text' name='tag_edit__tags' value='$h_tags' class='autocomplete_tags' id='tag_editor' onfocus='$(\".view\").hide(); $(\".edit\").show();'>
 				</td>
 			</tr>
 		";
diff --git a/ext/view/theme.php b/ext/view/theme.php
index 668e9289..7e0bd8b9 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -86,11 +86,6 @@ class ViewImageTheme extends Themelet {
 		$html .= "
 					</table>
 				</form>
-				<script>
-				$(function() {
-					$('.edit').hide();
-				});
-				</script>
 		";
 		return $html;
 	}
diff --git a/themes/default/style.css b/themes/default/style.css
index 370a9dc8..6f2e8945 100644
--- a/themes/default/style.css
+++ b/themes/default/style.css
@@ -241,3 +241,6 @@ UL {
 	text-align: right;
 	padding-right: 4px;
 }
+.image_info .edit {
+	display: none;
+}