diff --git a/setoolsgui/apol/objclassquery.py b/setoolsgui/apol/objclassquery.py
index 3494b72..debfa7e 100644
--- a/setoolsgui/apol/objclassquery.py
+++ b/setoolsgui/apol/objclassquery.py
@@ -29,6 +29,8 @@ from ..models import PermListModel, SEToolsListModel, invert_list_selection
 from ..objclassmodel import ObjClassTableModel, class_detail
 from ..widget import SEToolsWidget
 from .queryupdater import QueryResultsUpdater
+from .workspace import load_checkboxes, load_lineedits, load_listviews, load_textedits, \
+                       save_checkboxes, save_lineedits, save_listviews, save_textedits
 
 
 class ObjClassQueryTab(SEToolsWidget, QScrollArea):
@@ -168,6 +170,26 @@ class ObjClassQueryTab(SEToolsWidget, QScrollArea):
     def invert_perms_selection(self):
         invert_list_selection(self.perms.selectionModel())
 
+    #
+    # Save/Load tab
+    #
+    def save(self):
+        """Return a dictionary of settings."""
+        settings = {}
+        save_checkboxes(self, settings, ["criteria_expander", "notes_expander", "name_regex",
+                                         "perms_equal"])
+        save_lineedits(self, settings, ["name"])
+        save_listviews(self, settings, ["common", "perms"])
+        save_textedits(self, settings, ["notes"])
+        return settings
+
+    def load(self, settings):
+        load_checkboxes(self, settings, ["criteria_expander", "notes_expander", "name_regex",
+                                         "perms_equal"])
+        load_lineedits(self, settings, ["name"])
+        load_listviews(self, settings, ["common", "perms"])
+        load_textedits(self, settings, ["notes"])
+
     #
     # Results runner
     #