diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 009d0749..c0016be1 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -10,14 +10,11 @@
 </header>
 {{ end }}
 
+
 {{ $pages := .RegularPages }}
 
 {{ if .IsHome }}
 {{ $pages = where site.RegularPages "Type" "in" site.Params.mainSections }}
-
-{{- if .Site.Params.homeInfoParams }}
-{{- partial "homeInfo.html" . }}
-{{- end }}
 {{end}}
 
 {{ $paginator := .Paginate $pages }}
@@ -26,9 +23,11 @@
 
 {{- $class := "post-entry" }}
 {{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0)) }}
-{{- if not .Site.Params.homeInfoParams | or .Site.Params.disableSpecial1stPost}}
+{{- if .Site.Params.homeInfoParams | or .Site.Params.disableSpecial1stPost}}
+{{- partial "homeInfo.html" . }}
+{{else}}
 {{- $class = "first-entry" }}
-{{- end }}
+{{ end }}
 {{- else if .Data.Term }}
 {{- $class = "post-entry tag-entry" }}
 {{- end }}