diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c9356fbd7c..910d35afc4b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-28  João Távora  <joaotavora@gmail.com>
+
+	* elec-pair.el (electric-pair-post-self-insert-function): Don't
+	open extra newlines at beginning of buffer.  (Bug#16272)
+
 2013-12-28  Eli Zaretskii  <eliz@gnu.org>
 
 	* frame.el (window-system-for-display): Don't allow to create a
diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el
index 1691fbbfec3..729132651db 100644
--- a/lisp/elec-pair.el
+++ b/lisp/elec-pair.el
@@ -513,7 +513,7 @@ happened."
                       (funcall electric-pair-open-newline-between-pairs)
                     electric-pair-open-newline-between-pairs)
                   (eq last-command-event ?\n)
-                  (not (eobp))
+                  (< (1+ (point-min)) (point) (point-max))
                   (eq (save-excursion
                         (skip-chars-backward "\t\s")
                         (char-before (1- (point))))