diff --git a/data/org.gnome.Shell.Extensions.GSConnect.desktop.in b/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
index ffb23342..b405c73b 100644
--- a/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
+++ b/data/org.gnome.Shell.Extensions.GSConnect.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Name=GSConnect
-Exec=gapplication launch org.gnome.Shell.Extensions.GSConnect %U
+Exec=@gapplication@ launch org.gnome.Shell.Extensions.GSConnect %U
 Terminal=false
 NoDisplay=true
 Icon=org.gnome.Shell.Extensions.GSConnect
diff --git a/src/extension.js b/src/extension.js
index e7fd971a..8474bb3b 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -1,5 +1,7 @@
 'use strict';
 
+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));
+
 const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
diff --git a/src/prefs.js b/src/prefs.js
index 922ea60c..2cd62eb5 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -1,5 +1,7 @@
 'use strict';
 
+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path));
+
 const {Gio, GLib, Adw} = imports.gi;
 
 // Bootstrap