diff --git a/src/IDF/templates/idf/base-full.html b/src/IDF/templates/idf/base-full.html
index 0c09933..317e487 100644
--- a/src/IDF/templates/idf/base-full.html
+++ b/src/IDF/templates/idf/base-full.html
@@ -73,15 +73,18 @@
 {include 'idf/js-hotkeys.html'}
 {block javascript}{/block}
 {if $project}
-<script type="text/javascript">{literal}
-<!-- //
- $(document).ready(function(){
+<script type="text/javascript" charset="utf-8">{literal}
+//<![CDATA[
+$(document).ready(function(){
 	var frag = location.hash;
-	if (frag.length > 3 && frag.substring(0, 3) == '#ic') {
+	if ($('#preview').length) {
+		location.hash = '#preview';
+	}
+	else if (frag.length > 3 && frag.substring(0, 3) == '#ic') {
 		$(frag).addClass("issue-comment-focus");
 	}
 });
-//  -->{/literal}
+//]]>{/literal}
 </script>{/if}
 </body>
 </html>
diff --git a/src/IDF/templates/idf/base.html b/src/IDF/templates/idf/base.html
index 39c3dc9..557d579 100644
--- a/src/IDF/templates/idf/base.html
+++ b/src/IDF/templates/idf/base.html
@@ -75,15 +75,18 @@
 {include 'idf/js-hotkeys.html'}
 {block javascript}{/block}
 {if $project}
-<script type="text/javascript">{literal}
-<!-- //
- $(document).ready(function(){
+<script type="text/javascript" charset="utf-8">{literal}
+//<![CDATA[
+$(document).ready(function(){
 	var frag = location.hash;
-	if (frag.length > 3 && frag.substring(0, 3) == '#ic') {
+	if ($('#preview').length) {
+		location.hash = '#preview';
+	}
+	else if (frag.length > 3 && frag.substring(0, 3) == '#ic') {
 		$(frag).addClass("issue-comment-focus");
 	}
 });
-//  -->{/literal}
+//]]>{/literal}
 </script>{/if}
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/src/IDF/templates/idf/issues/create.html b/src/IDF/templates/idf/issues/create.html
index d2c5716..ceeee4d 100644
--- a/src/IDF/templates/idf/issues/create.html
+++ b/src/IDF/templates/idf/issues/create.html
@@ -11,14 +11,14 @@
 {/if}
 
 {if $preview}
-<h2 class="top">{trans 'Preview'}</h2>
+<h2 id="preview" class="top">{trans 'Preview'}</h2>
 <div class="issue-comment issue-comment-first issue-comment-last">
 <br /><pre class="issue-comment-text">{issuetext $preview, $request}</pre>
 </div>
 <hr />
 {/if}
 
-<form method="post" enctype="multipart/form-data" action="{url 'IDF_Views_Issue::create', array($project.shortname)}" >
+<form method="post" enctype="multipart/form-data" action="{url 'IDF_Views_Issue::create', array($project.shortname)}#preview" >
 <table class="form" summary="">
 <tr>
 <th><strong>{$form.f.summary.labelTag}:</strong></th>
diff --git a/src/IDF/templates/idf/issues/view.html b/src/IDF/templates/idf/issues/view.html
index 49efb1c..ad7f809 100644
--- a/src/IDF/templates/idf/issues/view.html
+++ b/src/IDF/templates/idf/issues/view.html
@@ -53,7 +53,7 @@
 {/if}
 
 {if $preview}
-<h2>{trans 'Preview'}</h2>
+<h2 id="preview">{trans 'Preview'}</h2>
 <div class="issue-comment issue-comment-first issue-comment-last">
 <br /><pre class="issue-comment-text">{issuetext $preview, $request}</pre>
 </div>
diff --git a/src/IDF/templates/idf/wiki/create.html b/src/IDF/templates/idf/wiki/create.html
index 2780222..1b2975b 100644
--- a/src/IDF/templates/idf/wiki/create.html
+++ b/src/IDF/templates/idf/wiki/create.html
@@ -3,7 +3,7 @@
 {block body}
 
 {if $preview}
-<h2 class="top">{trans 'Preview of the Page'}</h2>
+<h2 id="preview" class="top">{trans 'Preview of the Page'}</h2>
 
 {markdown $preview, $request}
 {/if}
diff --git a/src/IDF/templates/idf/wiki/update.html b/src/IDF/templates/idf/wiki/update.html
index 3fa6af5..91d579b 100644
--- a/src/IDF/templates/idf/wiki/update.html
+++ b/src/IDF/templates/idf/wiki/update.html
@@ -3,7 +3,7 @@
 {block body}
 
 {if $preview}
-<h2 class="top">{trans 'Preview of the Page'}</h2>
+<h2 id="preview" class="top">{trans 'Preview of the Page'}</h2>
 
 {markdown $preview, $request}
 {/if}