diff --git a/screen.cpp b/screen.cpp
index 4b9f3f59d..03bdd5b42 100644
--- a/screen.cpp
+++ b/screen.cpp
@@ -875,6 +875,10 @@ void s_write( screen_t *s,
         truncated_autosuggestion_line.push_back(ellipsis_char);
         commandline = truncated_autosuggestion_line.c_str();
     }
+	for( i=0; i<prompt_width; i++ )
+	{
+		s_desired_append_char( s, L' ', 0, 0, prompt_width );
+	}
 
 	/*
 	  If overflowing, give the prompt its own line to improve the
@@ -882,23 +886,9 @@ void s_write( screen_t *s,
 	 */
 	if( max_line_width + prompt_width >= screen_width )
 	{
-		for( i=0; i<prompt_width; i++ )
-		{
-			s_desired_append_char( s, L' ', 0, 0, prompt_width );
-		}
-
 		s_desired_append_char( s, L'\n', 0, 0, 0 );
 		prompt_width=0;
 	}
-	else
-	{
-		for( i=0; i<prompt_width; i++ )
-		{
-			s_desired_append_char( s, L' ', 0, 0, prompt_width );
-		}
-	}
-	
-
 	
 	for( i=0; commandline[i]; i++ )
 	{
diff --git a/share/functions/funced.fish b/share/functions/funced.fish
index 075b03019..f35a72fa4 100644
--- a/share/functions/funced.fish
+++ b/share/functions/funced.fish
@@ -84,6 +84,6 @@ function funced --description 'Edit function definition'
         . $tmpname
     end
     set -l stat $status 
-    rm $tmpname >/dev/null
+    rm -f $tmpname >/dev/null
     return $stat
 end
diff --git a/share/functions/history.fish b/share/functions/history.fish
index 7383f52ef..73fea995e 100644
--- a/share/functions/history.fish
+++ b/share/functions/history.fish
@@ -100,14 +100,12 @@ function history --description "Deletes an item from history"
 								builtin history --delete $item
 							end
 							printf "Deleted all!\n"
-							return 
 						else
 							builtin history --delete $found_items[(math $i - 1)]
 						end
 
 					end
 				end
-                
  				#Save changes after deleting item(s)
   				builtin history --save
 			 end