diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index d0d343b7..e0b9aeac 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -38,6 +38,7 @@ target_sources(app PRIVATE src/behaviors/behavior_key_press.c)
 target_sources(app PRIVATE src/behaviors/behavior_reset.c)
 target_sources(app PRIVATE src/behaviors/behavior_mod_tap.c)
 target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c)
+target_sources(app PRIVATE src/behaviors/behavior_toggle_layer.c)
 target_sources(app PRIVATE src/behaviors/behavior_transparent.c)
 target_sources(app PRIVATE src/behaviors/behavior_sensor_rotate_key_press.c)
 target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/behaviors/behavior_rgb_underglow.c)
diff --git a/app/dts/behaviors.dtsi b/app/dts/behaviors.dtsi
index 04e42b63..a47a8b85 100644
--- a/app/dts/behaviors.dtsi
+++ b/app/dts/behaviors.dtsi
@@ -2,6 +2,7 @@
 #include <behaviors/transparent.dtsi>
 #include <behaviors/mod_tap.dtsi>
 #include <behaviors/momentary_layer.dtsi>
+#include <behaviors/toggle_layer.dtsi>
 #include <behaviors/reset.dtsi>
 #include <behaviors/sensor_rotate_key_press.dtsi>
 #include <behaviors/rgb_underglow.dtsi>
\ No newline at end of file
diff --git a/app/dts/behaviors/toggle_layer.dtsi b/app/dts/behaviors/toggle_layer.dtsi
new file mode 100644
index 00000000..df6fd231
--- /dev/null
+++ b/app/dts/behaviors/toggle_layer.dtsi
@@ -0,0 +1,9 @@
+/ {
+	behaviors {
+		tog: behavior_toggle_layer {
+			compatible = "zmk,behavior-toggle-layer";
+			label = "TOGGLE_LAYER";
+			#binding-cells = <1>;
+		};
+	};
+};
diff --git a/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml b/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
new file mode 100644
index 00000000..065949fe
--- /dev/null
+++ b/app/dts/bindings/behaviors/zmk,behavior-toggle-layer.yaml
@@ -0,0 +1,8 @@
+# Copyright (c) 2020, Cody McGinnis <brainwart@gmail.com>
+# SPDX-License-Identifier: MIT
+
+description: Toggle Layer
+
+compatible: "zmk,behavior-toggle-layer"
+
+include: one_param.yaml
diff --git a/app/include/zmk/keymap.h b/app/include/zmk/keymap.h
index 4a6bb37d..c55207f5 100644
--- a/app/include/zmk/keymap.h
+++ b/app/include/zmk/keymap.h
@@ -1,5 +1,6 @@
 #pragma once
 
+bool zmk_keymap_layer_active(u8_t layer);
 int zmk_keymap_layer_activate(u8_t layer);
 int zmk_keymap_layer_deactivate(u8_t layer);
 
diff --git a/app/src/behaviors/behavior_toggle_layer.c b/app/src/behaviors/behavior_toggle_layer.c
new file mode 100644
index 00000000..ff0fe6ab
--- /dev/null
+++ b/app/src/behaviors/behavior_toggle_layer.c
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020 Cody McGinnis <brainwart@gmail.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define DT_DRV_COMPAT zmk_behavior_toggle_layer
+
+#include <device.h>
+#include <drivers/behavior.h>
+#include <logging/log.h>
+
+#include <zmk/keymap.h>
+
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
+struct behavior_tog_config { };
+struct behavior_tog_data { };
+
+static int behavior_tog_init(struct device *dev)
+{
+	return 0;
+};
+
+
+static int tog_keymap_binding_pressed(struct device *dev, u32_t position, u32_t layer, u32_t _)
+{
+  LOG_DBG("position %d layer %d current %d", position, layer, zmk_keymap_layer_active(layer));
+
+  if (zmk_keymap_layer_active(layer))
+    return zmk_keymap_layer_deactivate(layer);
+
+  return zmk_keymap_layer_activate(layer);
+}
+
+static int tog_keymap_binding_released(struct device *dev, u32_t position, u32_t layer, u32_t _)
+{
+  return 0;
+}
+
+static const struct behavior_driver_api behavior_tog_driver_api = {
+  .binding_pressed = tog_keymap_binding_pressed,
+  .binding_released = tog_keymap_binding_released,
+};
+
+static const struct behavior_tog_config behavior_tog_config = {};
+
+static struct behavior_tog_data behavior_tog_data;
+
+DEVICE_AND_API_INIT(behavior_tog, DT_INST_LABEL(0), behavior_tog_init,
+                    &behavior_tog_data,
+                    &behavior_tog_config,
+                    APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
+                    &behavior_tog_driver_api);
diff --git a/app/src/keymap.c b/app/src/keymap.c
index ff494f76..ebb42eff 100644
--- a/app/src/keymap.c
+++ b/app/src/keymap.c
@@ -76,6 +76,11 @@ static struct zmk_behavior_binding zmk_sensor_keymap[ZMK_KEYMAP_LAYERS_LEN][ZMK_
 	WRITE_BIT(zmk_keymap_layer_state, layer, state); \
 	return 0;
 
+bool zmk_keymap_layer_active(u8_t layer)
+{
+	return (zmk_keymap_layer_state & (BIT(layer))) == (BIT(layer));
+};
+
 int zmk_keymap_layer_activate(u8_t layer)
 {
 	SET_LAYER_STATE(layer, true);