diff --git a/_includes/mode-toggle.html b/_includes/mode-toggle.html
index 4108c8354..da8086365 100644
--- a/_includes/mode-toggle.html
+++ b/_includes/mode-toggle.html
@@ -142,4 +142,10 @@
 
   });
 
+  $("#mode-toggle-wrapper").keyup(function(e){
+    if(e.keyCode == 13) {
+      toggle.flipMode();
+    }
+  });
+
 </script>
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 5fd3eb030..2acaa4bc3 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -52,7 +52,7 @@
   </ul> <!-- ul.nav.flex-column -->
 
   <div class="sidebar-bottom mt-auto d-flex flex-wrap justify-content-center align-items-center">
-
+    
     {% for entry in site.data.contact %}
       {% capture url %}
         {%- if entry.type == 'github' -%}
@@ -84,7 +84,7 @@
         <span class="icon-border order-2"></span>
       {% endif %}
 
-      <span id="mode-toggle-wrapper" class="order-1">
+      <span id="mode-toggle-wrapper" class="order-1" tabindex="0">
         {% include mode-toggle.html %}
       </span>
     {% endunless %}