diff --git a/CHANGES.rst b/CHANGES.rst
index 41afb28..03e8de3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 2.4.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Only use edit overlay if available for editing comments
+  [vangheem]
 
 
 2.4.2 (2015-05-04)
diff --git a/plone/app/discussion/browser/javascripts/comments.js b/plone/app/discussion/browser/javascripts/comments.js
index 0b56d51..32eb30a 100644
--- a/plone/app/discussion/browser/javascripts/comments.js
+++ b/plone/app/discussion/browser/javascripts/comments.js
@@ -189,12 +189,14 @@ require([  // jshint ignore:line
         /**********************************************************************
          * Edit a comment
          **********************************************************************/
-	$('form[name="edit"]').prepOverlay({
-        cssclass: 'overlay-edit-comment',
-        width: '60%',
-		subtype: 'ajax',
-		filter: '#content>*'
-	});
+    if($.fn.prepOverlay){
+    	$('form[name="edit"]').prepOverlay({
+            cssclass: 'overlay-edit-comment',
+            width: '60%',
+    		subtype: 'ajax',
+    		filter: '#content>*'
+    	});
+    }
 
         /**********************************************************************
          * Delete a comment and its answers.