diff --git a/README.md b/README.md
index 10a45bd..5d9dd94 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ This plugin uses [FontAwesome icons](http://fontawesome.io/)
 
 ### Changelog
 
+* **v 0.6.1** : fixed Github issue #20
 * **v 0.6.0** : NOW WITH CUSTOM FIELDS SUPPORT ! (Github #19)
 * **v 0.5.0** : fixed Github issue #18 : textarea fixed (jstoolbar or ckeditor)
 * **v 0.4.9** : fixed Github issue #17 : Datepicker fallback added for date fields
diff --git a/assets/javascripts/issue_dynamic_edit.js b/assets/javascripts/issue_dynamic_edit.js
index 89a1804..320c3b0 100644
--- a/assets/javascripts/issue_dynamic_edit.js
+++ b/assets/javascripts/issue_dynamic_edit.js
@@ -98,7 +98,8 @@ function initEditFields()
 		var value = CF_VALUE_JSON[i].value;
 		if(info.visible && info.editable)
 		{
-			if($('.details .attributes .cf_' + info.id + '.attribute .value').length)
+			if($('.details .attributes .cf_' + info.id + '.attribute .value').length
+				&& $('#issue_custom_field_values_' + info.id).length )
 			{
 				var htmlCopy = $('#issue_custom_field_values_' + info.id).get(0).outerHTML;
 				// 2 technics with simple or double quote (safety first)
diff --git a/init.rb b/init.rb
index 80e10b1..f2e2747 100644
--- a/init.rb
+++ b/init.rb
@@ -6,7 +6,7 @@ Redmine::Plugin.register :redmine_issue_dynamic_edit do
   name 'Redmine Dynamic edit Issue plugin'
   author 'Hugo Zilliox'
   description 'Allows users to dynamically update issue attributes in detailed view without refreshing the page (JIRA style)'
-  version '0.6.0'
+  version '0.6.1'
   url 'https://github.com/ilogeek/redmine_issue_dynamic_edit'
   author_url 'https://hzilliox.fr'
 end