diff --git a/common/gnome.nix b/common/gnome.nix
index ddb4f5b..db8b3e6 100644
--- a/common/gnome.nix
+++ b/common/gnome.nix
@@ -1,5 +1,25 @@
 { config, pkgs, ... }:
 
+with pkgs;
+let
+  gnome-shell-extension-pop-shell = stdenv.mkDerivation rec {
+    pname = "gnome-shell-extension-pop-shell";
+    version = "2020-03-12";
+
+    src = fetchFromGitHub {
+      owner = "pop-os";
+      repo = "shell";
+      rev = "6cd22230503b7bba0cc35f499a040f7d7eb44637";
+      sha256 = "1574c9v3ifkjag8kbib28rjzal7h3mb78inssl92wf0hvrlsvilr";
+    };
+
+    nativeBuildInputs = [ glib ];
+    buildInputs = [ nodePackages.typescript ];
+
+    # the gschema doesn't seem to be installed properly (see dconf)
+    makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
+  };
+in
 {
   environment.systemPackages = with pkgs; [
     gnome3.dconf-editor
@@ -7,6 +27,7 @@
     gnome3.gnome-shell-extensions # required for user-theme
     gnomeExtensions.dash-to-panel
     gnomeExtensions.appindicator
+    gnome-shell-extension-pop-shell
   ];
 
   # Enable Gnome 3
diff --git a/home/common/gnome.nix b/home/common/gnome.nix
index d853d29..56eb1a9 100644
--- a/home/common/gnome.nix
+++ b/home/common/gnome.nix
@@ -5,6 +5,7 @@
     "org/gnome/shell" = {
       enabled-extensions = [
         "user-theme@gnome-shell-extensions.gcampax.github.com"
+        "pop-shell@system76.com"
         "dash-to-panel@jderose9.github.com"
         "appindicatorsupport@rgcjonas.gmail.com"
       ];
@@ -17,6 +18,11 @@
     "org/gnome/shell/extensions/user-theme" = {
       name = "Pop-dark";
     };
+    "org/gnome/shell/extensions/pop-shell" = {
+      active-hint = true;
+      snap-to-grid = true;
+      tile-by-default = true;
+    };
     "org/gnome/shell/extensions/dash-to-panel" = {
       appicon-padding = 4;
       panel-size = 36;