diff --git a/Source/NSClipView.m b/Source/NSClipView.m
index 24fe45ab1..d59474d1e 100644
--- a/Source/NSClipView.m
+++ b/Source/NSClipView.m
@@ -44,6 +44,8 @@
 
 - (void)setDocumentView:(NSView*)aView
 {
+  if (_documentView == aView)
+    return;
   if (_documentView)
     [_documentView removeFromSuperview];