diff --git a/lib/pico.php b/lib/pico.php
index 2ed4448a0e1fcd3e70896b950a232241f67b3d04..82af0ceec7fee5c5f652712aab77b83a1f482d6f 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -221,7 +221,12 @@ class Pico {
 				unset($pages[$key]);
 				continue;
 			}
-			
+
+			// Ignore Emacs (and Nano) temp files
+			if (in_array(substr($page, -1), array('~','#'))) {
+				unset($pages[$key]);
+				continue;
+			}			
 			// Get title and format $page
 			$page_content = file_get_contents($page);
 			$page_meta = $this->read_file_meta($page_content);