diff --git a/fetch b/fetch
index 36401677..a6de9f53 100755
--- a/fetch
+++ b/fetch
@@ -886,10 +886,10 @@ getgtk () {
     fi
 
     # Format the string
-    gtk2theme=${gtk2theme/${name}=/}
+    gtk2theme=${gtk2theme/${name}*=/}
     gtk2theme=${gtk2theme//\"/}
     gtk2theme="$gtk2theme"
-    gtktheme="$gtk2theme [GTK2] "
+    [ "$gtktheme" ] && gtktheme="$gtk2theme [GTK2] "
 
     # Check for gtk3 theme
     if [ -f "$HOME/.config/gtk-3.0/settings.ini" ]; then
@@ -899,7 +899,7 @@ getgtk () {
     fi
 
     # Format the string
-    gtk3theme=${gtk3theme/${name}=/}
+    gtk3theme=${gtk3theme/${name}*=/}
     gtk3theme=${gtk3theme//\"/}
     gtk3theme="$gtk3theme"
     gtktheme="$gtk2theme $gtk3theme [GTK3]"