diff --git a/lib/pico.php b/lib/pico.php
index d2230bd..3feed0b 100644
--- a/lib/pico.php
+++ b/lib/pico.php
@@ -218,7 +218,11 @@ 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);
@@ -336,4 +340,4 @@ class Pico {
 
 }
 
-?>
\ No newline at end of file
+?>