diff --git a/_config.yml b/_config.yml
index 7f98f5f..f4e9c4e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -17,9 +17,9 @@ wiki:
 ### レイアウト関連 ###
 
 # デスクトップ判定
-media-desktop: "(min-width: 768px)"
+media-desktop: "all and (min-width: 768px)"
 # モバイル端末判定
-media-mobile: "(max-width: 767px)"
+media-mobile: "not all and (min-width: 768px)"
 
 ### Jekyll設定 ###
 
diff --git a/_sass/_article.scss b/_sass/_article.scss
index eb2ef5f..b5ce14b 100644
--- a/_sass/_article.scss
+++ b/_sass/_article.scss
@@ -18,7 +18,6 @@
     h5[id]::before,
     h6[id]::before {
       content: "";
-      display: block;
       height: $top-padding;
       margin: -$top-padding 0 0;
     }
diff --git a/_sass/_container.scss b/_sass/_container.scss
index 84ef04d..cbf226f 100644
--- a/_sass/_container.scss
+++ b/_sass/_container.scss
@@ -1,7 +1,6 @@
 // コンテナ
 #container {
   box-sizing: border-box;
-  min-height: 100vh;
 
   @include media-desktop {
     border-left: $border-default;
@@ -9,10 +8,13 @@
     box-shadow: $container-box-shadow;
     box-sizing: border-box;
     display: -ms-grid;
-    -ms-grid-template-columns: 20em 1fr;
+    -ms-grid-template-columns: auto 1fr;
+    -ms-grid-template-rows: auto 1fr auto;
     display: grid;
-    grid-template-columns: 20em 1fr;
+    grid-template-columns: auto 1fr;
+    grid-template-rows: auto 1fr auto;
     margin: 0 auto;
+    min-height: 100vh;
     width: 85vw;
 
     header {