diff --git a/ManuSurface/setup.sh b/ManuSurface/setup.sh
index cd062198..e00b684c 100755
--- a/ManuSurface/setup.sh
+++ b/ManuSurface/setup.sh
@@ -55,6 +55,9 @@ flatpak install -y flathub com.mattjakeman.ExtensionManager
 flatpak install -y flathub com.github.wwmm.easyeffects
 flatpak install -y flathub ch.threema.threema-web-desktop
 
+# Install JetBrains Stuff
+source "$softwareRoot/jetbrains-toolbox.sh"
+
 # Install equalizer
 source "$popOSRoot/equalizer/install.sh"
 
diff --git a/scripts/PopOS/software/jetbrains-toolbox.sh b/scripts/PopOS/software/jetbrains-toolbox.sh
new file mode 100755
index 00000000..3f2fb5ea
--- /dev/null
+++ b/scripts/PopOS/software/jetbrains-toolbox.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+# Elevate script
+if [ ! "$UID" -eq 0 ]
+then
+    sudo bash "$BASH_SOURCE"
+else
+    workingDirectory=$(pwd)
+    contextRoot=$(mktemp -d)
+    cd $contextRoot
+
+    curl -fsSL https://raw.githubusercontent.com/nagygergo/jetbrains-toolbox-install/1.1/jetbrains-toolbox.sh \
+        | bash
+
+    cd $workingDirectory
+    rm -rf $contextRoot
+
+    {
+        echo "[Desktop Entry]"
+        echo "Encoding=UTF-8"
+        echo "Type=Application"
+        echo "Terminal=false"
+        echo "Exec=/opt/jetbrains-toolbox/jetbrains-toolbox"
+        echo "Name=JetBrains Toolbox"
+    } > /usr/share/applications/jetbrains-toolbox.desktop
+fi